vol: Use FDH_SIZE more consistently

[openafs.git] / src / vol / volume.c

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 6d4af59..be8f6f0 100644 (file)
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -1790,18 +1790,18 @@ ShutdownVolumeWalk_r(struct DiskPartition64 * dp, int pass,
                (V_attachState(vp) != VOL_STATE_PREATTACHED)) {
                break;
            }
-           /* fall through */
+           AFS_FALLTHROUGH;
        case 1:
            if ((V_attachState(vp) == VOL_STATE_ATTACHED) &&
                (vp->header == NULL)) {
                break;
            }
-           /* fall through */
+           AFS_FALLTHROUGH;
        case 2:
            if (VIsExclusiveState(V_attachState(vp))) {
                break;
            }
-           /* fall through */
+           AFS_FALLTHROUGH;
        case 3:
            *idx = nqp;
            DeleteVolumeFromVByPList_r(vp);
@@ -1845,6 +1845,7 @@ VShutdownVolume_r(Volume * vp)
     case VOL_STATE_PREATTACHED:
     case VOL_STATE_ERROR:
        VChangeState_r(vp, VOL_STATE_UNATTACHED);
+       break;
     case VOL_STATE_UNATTACHED:
     case VOL_STATE_DELETED:
        break;
@@ -6483,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;