diff options
author | Yaniv Kaul <ykaul@redhat.com> | 2019-10-04 11:17:44 +0300 |
---|---|---|
committer | Xavi Hernandez <xhernandez@redhat.com> | 2019-10-14 08:21:52 +0000 |
commit | 704961a39ffd019487e36ac6dbd425399cb85cf2 (patch) | |
tree | bbdff1293d5cd5602a04d42822f2024d481a3754 /xlators/nfs/server | |
parent | 240eec91c6ab5818c3fa4a9087ba46bbed0e8d2b (diff) |
Multiple files: make root gfid a static variable
In many places we use it, compare to it, etc. It could be a static variable,
as it really doesn't change. I think it's better than initializing to 0
and then doing gfid[15] = 1 or other tricks.
I think there are additional oppportunuties to make more variables static.
This is an attempt at an easy one.
Change-Id: I7f23a30a94056d8f043645371ab841cbd0f90d19
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Diffstat (limited to 'xlators/nfs/server')
-rw-r--r-- | xlators/nfs/server/src/mount3.c | 10 | ||||
-rw-r--r-- | xlators/nfs/server/src/nfs-common.c | 5 | ||||
-rw-r--r-- | xlators/nfs/server/src/nfs-fops.c | 2 | ||||
-rw-r--r-- | xlators/nfs/server/src/nfs3-fh.c | 6 |
4 files changed, 7 insertions, 16 deletions
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c index 177046ecf8c..3b16bb82c74 100644 --- a/xlators/nfs/server/src/mount3.c +++ b/xlators/nfs/server/src/mount3.c @@ -920,14 +920,11 @@ mnt3svc_volume_mount(rpcsvc_request_t *req, struct mount3_state *ms, { inode_t *exportinode = NULL; int ret = -EFAULT; - uuid_t rootgfid = { - 0, - }; + static uuid_t rootgfid = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; if ((!req) || (!exp) || (!ms)) return ret; - rootgfid[15] = 1; exportinode = inode_find(exp->vol->itable, rootgfid); if (!exportinode) { gf_msg(GF_MNT, GF_LOG_ERROR, ENOENT, NFS_MSG_GET_ROOT_INODE_FAIL, @@ -1372,9 +1369,7 @@ __mnt3_resolve_subdir(mnt3_resolve_t *mres) nfs_user_t nfu = { 0, }; - uuid_t rootgfid = { - 0, - }; + static uuid_t rootgfid = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; if (!mres) return ret; @@ -1385,7 +1380,6 @@ __mnt3_resolve_subdir(mnt3_resolve_t *mres) if (!firstcomp) goto err; - rootgfid[15] = 1; ret = nfs_entry_loc_fill(mres->mstate->nfsx, mres->exp->vol->itable, rootgfid, firstcomp, &mres->resolveloc, NFS_RESOLVE_CREATE, NULL); diff --git a/xlators/nfs/server/src/nfs-common.c b/xlators/nfs/server/src/nfs-common.c index 5b3ee976e37..b8f6b6f318e 100644 --- a/xlators/nfs/server/src/nfs-common.c +++ b/xlators/nfs/server/src/nfs-common.c @@ -272,11 +272,8 @@ err: int nfs_root_loc_fill(inode_table_t *itable, loc_t *loc) { - uuid_t rootgfid = { - 0, - }; + static uuid_t rootgfid = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; - rootgfid[15] = 1; return nfs_gfid_loc_fill(itable, rootgfid, loc, NFS_RESOLVE_EXIST); } diff --git a/xlators/nfs/server/src/nfs-fops.c b/xlators/nfs/server/src/nfs-fops.c index 896c67c9305..4d8540c2c3e 100644 --- a/xlators/nfs/server/src/nfs-fops.c +++ b/xlators/nfs/server/src/nfs-fops.c @@ -327,7 +327,7 @@ nfs_gfid_dict(inode_t *inode) unsigned char *dyngfid = NULL; dict_t *dictgfid = NULL; int ret = -1; - uuid_t rootgfid = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; + static uuid_t rootgfid = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; dyngfid = GF_MALLOC(sizeof(uuid_t), gf_common_mt_char); if (dyngfid == NULL) diff --git a/xlators/nfs/server/src/nfs3-fh.c b/xlators/nfs/server/src/nfs3-fh.c index d0c0a2f55b2..caa3cfa6995 100644 --- a/xlators/nfs/server/src/nfs3-fh.c +++ b/xlators/nfs/server/src/nfs3-fh.c @@ -64,7 +64,7 @@ nfs3_fh_build_indexed_root_fh(xlator_list_t *cl, xlator_t *xl) struct iatt buf = { 0, }; - uuid_t root = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; + static uuid_t root = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; if ((!cl) || (!xl)) return fh; @@ -85,7 +85,7 @@ nfs3_fh_build_uuid_root_fh(uuid_t volumeid, uuid_t mountid) struct iatt buf = { 0, }; - uuid_t root = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; + static uuid_t root = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; gf_uuid_copy(buf.ia_gfid, root); nfs3_fh_init(&fh, &buf); @@ -98,7 +98,7 @@ nfs3_fh_build_uuid_root_fh(uuid_t volumeid, uuid_t mountid) int nfs3_fh_is_root_fh(struct nfs3_fh *fh) { - uuid_t rootgfid = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; + static uuid_t rootgfid = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}; if (!fh) return 0; |