jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 07:20:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vnode alloc bitnumber returns bitnumber

Browse Source 
fix function return types to match a bitnumber (int)
and comment the function appropriately

Change-Id: I9542c02b1aa7aacdd0596675992bb1e8a1708572
Reviewed-on: http://gerrit.openafs.org/1941
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Derrick Brashear 2010-05-11 11:40:09 -04:00
parent 134b599c3a
commit 88d13f1f58
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/vol/volume.c
View File

@ -5405,19 +5405,33 @@ VChildProcReconnectFS(void)
/* volume bitmap routines */ /* volume bitmap routines */
/***************************************************/ /***************************************************/
/* /**
* For demand attach fs, flags parameter controls * allocate a vnode bitmap number for the vnode
* locking behavior. If (flags & VOL_ALLOC_BITMAP_WAIT) *
* is set, then this function will create a reservation * @param[out] ec error code
* and block on any other exclusive operations. Otherwise, * @param[in] vp volume object pointer
* this function assumes the caller already has exclusive * @param[in] index vnode index number for the vnode
* access to vp, and we just change the volume state. * @param[in] flags flag values described in note
*
* @note for DAFS, flags parameter controls locking behavior.
* If (flags & VOL_ALLOC_BITMAP_WAIT) is set, then this function
* will create a reservation and block on any other exclusive
* operations. Otherwise, this function assumes the caller
* already has exclusive access to vp, and we just change the
* volume state.
*
* @pre VOL_LOCK held
*
* @return bit number allocated
*/ */
VnodeId /*
*/
int
VAllocBitmapEntry_r(Error * ec, Volume * vp, VAllocBitmapEntry_r(Error * ec, Volume * vp,
struct vnodeIndex *index, int flags) struct vnodeIndex *index, int flags)
{ {
VnodeId ret; int ret = 0;
register byte *bp, *ep; register byte *bp, *ep;
#ifdef AFS_DEMAND_ATTACH_FS #ifdef AFS_DEMAND_ATTACH_FS
VolState state_save; VolState state_save;
@ -5428,7 +5442,7 @@ VAllocBitmapEntry_r(Error * ec, Volume * vp,
/* This test is probably redundant */ /* This test is probably redundant */
if (!VolumeWriteable(vp)) { if (!VolumeWriteable(vp)) {
*ec = (bit32) VREADONLY; *ec = (bit32) VREADONLY;
return 0; return ret;
} }
#ifdef AFS_DEMAND_ATTACH_FS #ifdef AFS_DEMAND_ATTACH_FS
@ -5479,7 +5493,6 @@ VAllocBitmapEntry_r(Error * ec, Volume * vp,
vp->shuttingDown = 1; /* Let who has it free it. */ vp->shuttingDown = 1; /* Let who has it free it. */
vp->specialStatus = 0; vp->specialStatus = 0;
#endif /* AFS_DEMAND_ATTACH_FS */ #endif /* AFS_DEMAND_ATTACH_FS */
ret = NULL;
goto done; goto done;
} }
} }
@ -5504,7 +5517,7 @@ VAllocBitmapEntry_r(Error * ec, Volume * vp,
bp++; bp++;
o = ffs(~*bp) - 1; /* ffs is documented in BSTRING(3) */ o = ffs(~*bp) - 1; /* ffs is documented in BSTRING(3) */
*bp |= (1 << o); *bp |= (1 << o);
ret = (VnodeId) ((bp - index->bitmap) * 8 + o); ret = ((bp - index->bitmap) * 8 + o);
#ifdef AFS_DEMAND_ATTACH_FS #ifdef AFS_DEMAND_ATTACH_FS
VOL_LOCK; VOL_LOCK;
#endif /* AFS_DEMAND_ATTACH_FS */ #endif /* AFS_DEMAND_ATTACH_FS */
@ -5537,10 +5550,10 @@ VAllocBitmapEntry_r(Error * ec, Volume * vp,
return ret; return ret;
} }
VnodeId int
VAllocBitmapEntry(Error * ec, Volume * vp, register struct vnodeIndex * index) VAllocBitmapEntry(Error * ec, Volume * vp, register struct vnodeIndex * index)
{ {
VnodeId retVal; int retVal;
VOL_LOCK; VOL_LOCK;
retVal = VAllocBitmapEntry_r(ec, vp, index, VOL_ALLOC_BITMAP_WAIT); retVal = VAllocBitmapEntry_r(ec, vp, index, VOL_ALLOC_BITMAP_WAIT);
VOL_UNLOCK; VOL_UNLOCK;

8
src/vol/volume.h
View File

@ -774,10 +774,10 @@ extern Volume *VCreateVolume(Error * ec, char *partname, VolId volumeId,
VolId parentId); VolId parentId);
extern Volume *VCreateVolume_r(Error * ec, char *partname, VolId volumeId, extern Volume *VCreateVolume_r(Error * ec, char *partname, VolId volumeId,
VolId parentId); VolId parentId);
extern VnodeId VAllocBitmapEntry(Error * ec, Volume * vp, extern int VAllocBitmapEntry(Error * ec, Volume * vp,
struct vnodeIndex *index); struct vnodeIndex *index);
extern VnodeId VAllocBitmapEntry_r(Error * ec, Volume * vp, extern int VAllocBitmapEntry_r(Error * ec, Volume * vp,
struct vnodeIndex *index, int flags); struct vnodeIndex *index, int flags);
extern void VFreeBitMapEntry(Error * ec, register struct vnodeIndex *index, extern void VFreeBitMapEntry(Error * ec, register struct vnodeIndex *index,
unsigned bitNumber); unsigned bitNumber);
extern void VFreeBitMapEntry_r(Error * ec, register struct vnodeIndex *index, extern void VFreeBitMapEntry_r(Error * ec, register struct vnodeIndex *index,