diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2016-01-12 12:54:42 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2016-02-22 06:45:32 -0800 |
| commit | ad715122329d06d73a215c97ceb6221c31c09f7c (patch) | |
| tree | 96ee95e0a2aaeeb309b6313f0367ea0ca97960c4 /xlators/mount/fuse/src/fuse-resolve.c | |
| parent | ebe15f0d4371fa957d1342dd125443898cb14376 (diff) | |
fuse: send lookup if inode_ctx is not set
During resolving of an entry or inode, if inode ctx
was not set, we will send a lookup.
This patch also make sure that inode_ctx will be created
after every inode_link
Back port of>
>Change-Id: I4211533ca96a51b89d9f010fc57133470e52dc11
>BUG: 1297311
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
>Reviewed-on: http://review.gluster.org/13225
>Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Change-Id: I53d7f77b5b9a9e095aeeccdd3605dcce7eade0b2
BUG: 1306131
Tested-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-on: http://review.gluster.org/13416
Smoke: Gluster Build System <jenkins@build.gluster.com>
Tested-by: mohammed rafi kc <rkavunga@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'xlators/mount/fuse/src/fuse-resolve.c')
| -rw-r--r-- | xlators/mount/fuse/src/fuse-resolve.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/xlators/mount/fuse/src/fuse-resolve.c b/xlators/mount/fuse/src/fuse-resolve.c index 04f4e719ae1..8ee64460401 100644 --- a/xlators/mount/fuse/src/fuse-resolve.c +++ b/xlators/mount/fuse/src/fuse-resolve.c @@ -50,6 +50,7 @@ fuse_resolve_entry_cbk (call_frame_t *frame, void *cookie, xlator_t *this, fuse_resolve_t *resolve = NULL; inode_t *link_inode = NULL; loc_t *resolve_loc = NULL; + uint64_t ctx_value = LOOKUP_NOT_NEEDED; state = frame->root->state; resolve = state->resolve_now; @@ -70,7 +71,8 @@ fuse_resolve_entry_cbk (call_frame_t *frame, void *cookie, xlator_t *this, link_inode = inode_link (inode, resolve_loc->parent, resolve_loc->name, buf); - + if (link_inode == inode) + inode_ctx_set (link_inode, this, &ctx_value); state->loc_now->inode = link_inode; out: @@ -119,6 +121,7 @@ fuse_resolve_gfid_cbk (call_frame_t *frame, void *cookie, xlator_t *this, inode_t *link_inode = NULL; loc_t *loc_now = NULL; inode_t *tmp_inode = NULL; + uint64_t ctx_value = LOOKUP_NOT_NEEDED; state = frame->root->state; resolve = state->resolve_now; @@ -151,6 +154,8 @@ fuse_resolve_gfid_cbk (call_frame_t *frame, void *cookie, xlator_t *this, } link_inode = inode_link (inode, NULL, NULL, buf); + if (link_inode == inode) + inode_ctx_set (link_inode, this, &ctx_value); loc_wipe (&resolve->resolve_loc); @@ -231,9 +236,11 @@ fuse_resolve_parent_simple (fuse_state_t *state) loc_t *loc = NULL; inode_t *parent = NULL; inode_t *inode = NULL; + xlator_t *this = NULL; resolve = state->resolve_now; loc = state->loc_now; + this = state->this; loc->name = resolve->bname; @@ -281,7 +288,7 @@ fuse_resolve_parent_simple (fuse_state_t *state) gf_uuid_copy (loc->pargfid, resolve->pargfid); inode = inode_grep (state->itable, parent, loc->name); - if (inode) { + if (inode && !inode_needs_lookup (inode, this)) { loc->inode = inode; /* decisive result - resolution success */ return 0; |