From: Benjamin Kaduk Date: Mon, 13 Jan 2014 21:08:14 +0000 (-0500) Subject: De-duplicate a couple afs_CheckCode uniquifiers X-Git-Tag: openafs-stable-1_8_0pre1~839 X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=b921bf94f6433f831a8d241b5a7e96b63dc5f3f7 De-duplicate a couple afs_CheckCode uniquifiers These uniquifiers are supposed to be globally unique, to identify the call site within the tree. For whatever reason, a couple of them were duplicated at different call sites; provide new (unique) values to disambiguate between them. There remain a couple of uniquifiers which are used in multiple places, but those are in different architectures' implementations of afs/ARCH/foo.c, and thus will be globally unique for any particular build. Change-Id: Iff5defcade74143a45d7ef3aaacbdeb7523f2a40 Reviewed-on: http://gerrit.openafs.org/10709 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/afs/LINUX/osi_export.c b/src/afs/LINUX/osi_export.c index 662966b..5d90ced 100644 --- a/src/afs/LINUX/osi_export.c +++ b/src/afs/LINUX/osi_export.c @@ -512,7 +512,7 @@ static struct dentry *get_dentry_from_fid(cred_t *credp, struct VenusFid *afid) code); #endif afs_PutVCache(vcp); - return ERR_PTR(-afs_CheckCode(code, &treq, 101)); + return ERR_PTR(-afs_CheckCode(code, &treq, 103)); } ip = AFSTOV(vcp); diff --git a/src/afs/VNOPS/afs_vnop_access.c b/src/afs/VNOPS/afs_vnop_access.c index 4df769e..13bba66 100644 --- a/src/afs/VNOPS/afs_vnop_access.c +++ b/src/afs/VNOPS/afs_vnop_access.c @@ -349,7 +349,7 @@ afs_getRights(OSI_VC_DECL(avc), afs_int32 arights, code = afs_VerifyVCache(avc, &treq); if (code) { - code = afs_CheckCode(code, &treq, 16); + code = afs_CheckCode(code, &treq, 18); return code; }