From 9bb81711a545122bba36c525095aebfe52e73168 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Wed, 13 Jul 2011 14:31:15 +0100 Subject: [PATCH] Mark nearInode as unused When we're building an inode fileserver, we use the nearInode hint. The IH_CREATE macro just throws this hint away if we're building namei, which leads to compiler warnings about set-but-unused variables. Just flag nearInode as being potentially unused in order to suppress these warnings. Change-Id: I25022dc859974e9311e4530a9eeee8ab1d77c373 Reviewed-on: http://gerrit.openafs.org/4999 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/viced/afsfileprocs.c | 5 +++-- src/vol/vutil.c | 2 +- src/volser/dumpstuff.c | 2 +- src/volser/vol_split.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index 18fe4f249..d09ef968c 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -1175,7 +1175,8 @@ RXStore_AccessList(Vnode * targetptr, struct AFSOpaque *AccessList) static int CopyOnWrite(Vnode * targetptr, Volume * volptr, afs_foff_t off, afs_fsize_t len) { - Inode ino, nearInode; + Inode ino; + Inode nearInode AFS_UNUSED; ssize_t rdlen; ssize_t wrlen; afs_fsize_t size; @@ -1794,7 +1795,7 @@ Alloc_NewVnode(Vnode * parentptr, DirHandle * dir, Volume * volptr, Error errorCode = 0; /* Error code returned back */ Error temp; Inode inode = 0; - Inode nearInode; /* hint for inode allocation in solaris */ + Inode nearInode AFS_UNUSED; /* hint for inode allocation in solaris */ afs_ino_str_t stmp; if ((errorCode = diff --git a/src/vol/vutil.c b/src/vol/vutil.c index 396832d51..1e0edc641 100644 --- a/src/vol/vutil.c +++ b/src/vol/vutil.c @@ -109,7 +109,7 @@ VCreateVolume_r(Error * ec, char *partname, VolId volumeId, VolId parentId) struct VolumeDiskHeader diskHeader; IHandle_t *handle; FdHandle_t *fdP; - Inode nearInode = 0; + Inode nearInode AFS_UNUSED = 0; char *part, *name; struct stat st; struct VolumeHeader tempHeader; diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index 1d48936c0..702363be3 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -1303,7 +1303,7 @@ ReadVnodes(struct iod *iodp, Volume * vp, int incremental, struct VnodeClassInfo *vcp; IHandle_t *tmpH; FdHandle_t *fdP; - Inode nearInode; + Inode nearInode AFS_UNUSED; afs_int32 critical = 0; tag = iod_getc(iodp); diff --git a/src/volser/vol_split.c b/src/volser/vol_split.c index f862f8927..e8377cb8a 100644 --- a/src/volser/vol_split.c +++ b/src/volser/vol_split.c @@ -377,7 +377,7 @@ afs_int32 copyVnodes(struct Msg *m, Volume *vol, Volume *newvol, ino = VNDISK_GET_INO(vnode); if (ino) { IHandle_t *h, *newh; - Inode nearInode; + Inode AFS_UNUSED nearInode; #if defined(NEARINODE_HINT) && !defined(AFS_NAMEI_ENV) V_pref(vol,nearInode) #endif -- 2.39.5