vol: Use FDH_SIZE more consistently

Several callers use OS_SIZE(fdP->fd_fd) instead of just calling
FDH_SIZE(fdP). Right now these calls are equivalent, but change all of
these callers to use FDH_SIZE, to make it easier to possibly change
the behavior of FDH_SIZE in the future.

Change-Id: If846c160c71f11935de8c0e4634afa2c7f7ee53f
Reviewed-on: https://gerrit.openafs.org/14657
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index b608734..0ac27e9 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -6315,7 +6315,7 @@ GetLinkCountAndSize(Volume * vp, FdHandle_t * fdP, int *lc,
     FDH_CLOSE(lhp);
     if (*lc < 0)
        return -1;
-    *size = OS_SIZE(fdP->fd_fd);
+    *size = FDH_SIZE(fdP);
     return (*size == -1) ? -1 : 0;
 #else
     struct afs_stat status;

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index 706f9f0..f10e7b1 100644 (file)
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -2715,7 +2715,7 @@ SalvageIndex(struct SalvInfo *salvinfo, Inode ino, VnodeClass class, int RW,
     file = FDH_FDOPEN(fdP, "r+");
     opr_Assert(file != NULL);
     vcp = &VnodeClassInfo[class];
-    size = OS_SIZE(fdP->fd_fd);
+    size = FDH_SIZE(fdP);
     opr_Assert(size != -1);
     nVnodes = (size / vcp->diskSize) - 1;
     if (nVnodes > 0) {
@@ -3387,7 +3387,7 @@ DistilVnodeEssence(struct SalvInfo *salvinfo, VolumeId rwVId,
     opr_Assert(fdP != NULL);
     file = FDH_FDOPEN(fdP, "r+");
     opr_Assert(file != NULL);
-    size = OS_SIZE(fdP->fd_fd);
+    size = FDH_SIZE(fdP);
     opr_Assert(size != -1);
     vip->nVnodes = (size / vcp->diskSize) - 1;
     if (vip->nVnodes > 0) {

diff --git a/src/vol/volume.c b/src/vol/volume.c
index f52a560..be8f6f0 100644 (file)
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -6484,7 +6484,7 @@ VGetBitmap_r(Error * ec, Volume * vp, VnodeClass class)
     opr_Assert(file != NULL);
     vnode = malloc(vcp->diskSize);
     opr_Assert(vnode != NULL);
-    size = OS_SIZE(fdP->fd_fd);
+    size = FDH_SIZE(fdP);
     opr_Assert(size != -1);
     nVnodes = (size <= vcp->diskSize ? 0 : size - vcp->diskSize)
        >> vcp->logSize;

diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c
index 3a7c85e..8c044d6 100644 (file)
--- a/src/volser/dumpstuff.c
+++ b/src/volser/dumpstuff.c
@@ -968,7 +968,7 @@ DumpVnodeIndex(struct iod *iodp, Volume * vp, VnodeClass class,
     opr_Assert(fdP != NULL);
     file = FDH_FDOPEN(fdP, "r+");
     opr_Assert(file != NULL);
-    size = OS_SIZE(fdP->fd_fd);
+    size = FDH_SIZE(fdP);
     opr_Assert(size != -1);
     nVnodes = (size / vcp->diskSize) - 1;
     if (nVnodes > 0) {
@@ -1172,7 +1172,7 @@ ProcessIndex(Volume * vp, VnodeClass class, afs_foff_t ** Bufp, int *sizep,
        STREAM_FLUSH(afile);    /* ensure 0s are on the disk */
        OS_SYNC(afile->str_fd);
     } else {
-       size = OS_SIZE(fdP->fd_fd);
+       size = FDH_SIZE(fdP);
        opr_Assert(size != -1);
        nVnodes =
            (size <=
@@ -1922,7 +1922,7 @@ SizeDumpVnodeIndex(struct iod *iodp, Volume * vp, VnodeClass class,
     opr_Assert(fdP != NULL);
     file = FDH_FDOPEN(fdP, "r+");
     opr_Assert(file != NULL);
-    size = OS_SIZE(fdP->fd_fd);
+    size = FDH_SIZE(fdP);
     opr_Assert(size != -1);
     nVnodes = (size / vcp->diskSize) - 1;
     if (nVnodes > 0) {

diff --git a/src/volser/vol-dump.c b/src/volser/vol-dump.c
index 9a077a4..0fdf0e3 100644 (file)
--- a/src/volser/vol-dump.c
+++ b/src/volser/vol-dump.c
@@ -769,7 +769,7 @@ DumpVnodeIndex(int dumpfd, Volume * vp, VnodeClass class, afs_int32 fromtime,
 
     fdP = IH_OPEN(vp->vnodeIndex[class].handle);
     file = FDH_FDOPEN(fdP, "r+");
-    size = OS_SIZE(fdP->fd_fd);
+    size = FDH_SIZE(fdP);
     nVnodes = (size / vcp->diskSize) - 1;
 
     if (nVnodes > 0) {