diff options
| author | Anand Avati <avati@redhat.com> | 2013-11-20 15:11:13 -0800 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-11-21 13:11:18 -0800 |
| commit | fee08b2cbf8c118d33dea745e0ae3033b36969da (patch) | |
| tree | e7f42b21457ba1fe63ad994559dba0d799fb4168 /xlators | |
| parent | 544dee895a43ec9bb98fc8ace3d124d44bb617f2 (diff) | |
fuse: revalidate group id cache on uid/gid change detection
- Remember the uid and gid of the pid at the time of caching
the group id list.
- Next time when referring to the cache confirm that uid and gid
of that pid has not changed since. If it has, treat it like
a timeout/cache miss.
- Solves group id caching issue caused when Samba runs on gluster
FUSE mount and changes the uid/gid on a per syscall basis.
Change-Id: I3382b037ff0b6d5eaaa36d9c898232543475aeda
BUG: 1032438
Signed-off-by: Anand Avati <avati@redhat.com>
Reviewed-on: http://review.gluster.org/6320
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mount/fuse/src/fuse-helpers.c | 5 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs-fops.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/xlators/mount/fuse/src/fuse-helpers.c b/xlators/mount/fuse/src/fuse-helpers.c index 4d478b919f2..6c54cb88200 100644 --- a/xlators/mount/fuse/src/fuse-helpers.c +++ b/xlators/mount/fuse/src/fuse-helpers.c @@ -266,7 +266,8 @@ static void get_groups(fuse_private_t *priv, call_frame_t *frame) return; } - gl = gid_cache_lookup(&priv->gid_cache, frame->root->pid); + gl = gid_cache_lookup(&priv->gid_cache, frame->root->pid, + frame->root->uid, frame->root->gid); if (gl) { if (call_stack_alloc_groups (frame->root, gl->gl_count) != 0) return; @@ -280,6 +281,8 @@ static void get_groups(fuse_private_t *priv, call_frame_t *frame) frame_fill_groups (frame); agl.gl_id = frame->root->pid; + agl.gl_uid = frame->root->uid; + agl.gl_gid = frame->root->gid; agl.gl_count = frame->root->ngrps; agl.gl_list = GF_CALLOC(frame->root->ngrps, sizeof(gid_t), gf_fuse_mt_gids_t); diff --git a/xlators/nfs/server/src/nfs-fops.c b/xlators/nfs/server/src/nfs-fops.c index 236b80c7620..60a5a9a843c 100644 --- a/xlators/nfs/server/src/nfs-fops.c +++ b/xlators/nfs/server/src/nfs-fops.c @@ -47,7 +47,7 @@ nfs_fix_groups (xlator_t *this, call_stack_t *root) return; } - agl = gid_cache_lookup(&priv->gid_cache, root->uid); + agl = gid_cache_lookup(&priv->gid_cache, root->uid, 0, 0); if (agl) { for (ngroups = 0; ngroups < agl->gl_count; ngroups++) root->groups[ngroups] = agl->gl_list[ngroups]; @@ -84,6 +84,8 @@ nfs_fix_groups (xlator_t *this, call_stack_t *root) if (gl.gl_list) { /* It's not fatal if the alloc failed. */ gl.gl_id = root->uid; + gl.gl_uid = 0; + gl.gl_gid = 0; gl.gl_count = ngroups; memcpy(gl.gl_list, mygroups, sizeof(gid_t) * ngroups); if (gid_cache_add(&priv->gid_cache, &gl) != 1) |