From: Michael Meffie Date: Mon, 21 Jul 2014 21:41:32 +0000 (-0400) Subject: vol: rename volUpdateCounter macro X-Git-Tag: upstream/1.8.0_pre1^2~408 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=218561a5d920bb9bfaa668d3bdd11e1dfac1df9f;p=packages%2Fo%2Fopenafs.git vol: rename volUpdateCounter macro Change the volUpdateCounter volume macro name to be consistent with the volume header name. Change-Id: I55f55f2c084135e9598c194ed9081fce800ddfe9 Reviewed-on: http://gerrit.openafs.org/11318 Reviewed-by: Chas Williams - CONTRACTOR Reviewed-by: Benjamin Kaduk Tested-by: BuildBot --- diff --git a/src/vol/vnode.c b/src/vol/vnode.c index 9eb120d17..fd639db6c 100644 --- a/src/vol/vnode.c +++ b/src/vol/vnode.c @@ -1428,8 +1428,8 @@ VPutVnode_r(Error * ec, Vnode * vnp) if (vnp->changed_newTime) { V_updateDate(vp) = vp->updateTime = now; - if(V_volUpCounter(vp)< UINT_MAX) - V_volUpCounter(vp)++; + if(V_volUpdateCounter(vp)< UINT_MAX) + V_volUpdateCounter(vp)++; } /* The vnode has been changed. Write it out to disk */ diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c index e5b39fbfc..3d4b277a3 100644 --- a/src/vol/vol-info.c +++ b/src/vol/vol-info.c @@ -1175,7 +1175,7 @@ PrintHeader(Volume * vp) V_dayUse(vp), V_weekUse(vp)[0], V_weekUse(vp)[1], V_weekUse(vp)[2], V_weekUse(vp)[3], V_weekUse(vp)[4], V_weekUse(vp)[5], V_weekUse(vp)[6], date(V_dayUseDate(vp))); - printf("volUpdateCounter = %u\n", V_volUpCounter(vp)); + printf("volUpdateCounter = %u\n", V_volUpdateCounter(vp)); } /** diff --git a/src/vol/volume.h b/src/vol/volume.h index 5e7d71b6c..7762f237e 100644 --- a/src/vol/volume.h +++ b/src/vol/volume.h @@ -776,7 +776,7 @@ struct volHeader { #define V_stat_fileDiffAuthor(vp, idx) (((vp)->header->diskstuff.stat_fileDiffAuthor)[idx]) #define V_stat_dirSameAuthor(vp, idx) (((vp)->header->diskstuff.stat_dirSameAuthor)[idx]) #define V_stat_dirDiffAuthor(vp, idx) (((vp)->header->diskstuff.stat_dirDiffAuthor)[idx]) -#define V_volUpCounter(vp) ((vp)->header->diskstuff.volUpdateCounter) +#define V_volUpdateCounter(vp) ((vp)->header->diskstuff.volUpdateCounter) /* File offset computations. The offset values in the volume header are computed with these macros -- when the file is written only!! */