From ad715122329d06d73a215c97ceb6221c31c09f7c Mon Sep 17 00:00:00 2001 From: Mohammed Rafi KC Date: Tue, 12 Jan 2016 12:54:42 +0530 Subject: 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 >Reviewed-on: http://review.gluster.org/13225 >Reviewed-by: Dan Lambright Change-Id: I53d7f77b5b9a9e095aeeccdd3605dcce7eade0b2 BUG: 1306131 Tested-by: Dan Lambright Reviewed-on: http://review.gluster.org/13416 Smoke: Gluster Build System Tested-by: mohammed rafi kc NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Dan Lambright --- xlators/mount/fuse/src/fuse-bridge.c | 18 +++++++++++++++--- xlators/mount/fuse/src/fuse-resolve.c | 11 +++++++++-- 2 files changed, 24 insertions(+), 5 deletions(-) (limited to 'xlators/mount/fuse/src') diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 895f3b0a1df..a6aa96e456c 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -382,6 +382,7 @@ fuse_entry_cbk (call_frame_t *frame, void *cookie, xlator_t *this, struct fuse_entry_out feo = {0, }; fuse_private_t *priv = NULL; inode_t *linked_inode = NULL; + uint64_t ctx_value = LOOKUP_NOT_NEEDED; priv = this->private; state = frame->root->state; @@ -431,6 +432,10 @@ fuse_entry_cbk (call_frame_t *frame, void *cookie, xlator_t *this, linked_inode = inode_link (inode, state->loc.parent, state->loc.name, buf); + if (linked_inode == inode) { + inode_ctx_set (linked_inode, this, &ctx_value); + } + inode_lookup (linked_inode); feo.nodeid = inode_to_fuse_nodeid (linked_inode); @@ -1914,6 +1919,7 @@ fuse_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this, struct fuse_open_out foo = {0, }; struct iovec iov_out[3]; inode_t *linked_inode = NULL; + uint64_t ctx_value = LOOKUP_NOT_NEEDED; state = frame->root->state; priv = this->private; @@ -1949,6 +1955,8 @@ fuse_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this, */ inode_unref (fd->inode); fd->inode = inode_ref (linked_inode); + } else { + inode_ctx_set (linked_inode, this, &ctx_value); } inode_lookup (linked_inode); @@ -4195,12 +4203,13 @@ out: int -fuse_nameless_lookup (xlator_t *xl, uuid_t gfid, loc_t *loc) +fuse_nameless_lookup (xlator_t *this, xlator_t *xl, uuid_t gfid, loc_t *loc) { int ret = -1; dict_t *xattr_req = NULL; struct iatt iatt = {0, }; inode_t *linked_inode = NULL; + uint64_t ctx_value = LOOKUP_NOT_NEEDED; if ((loc == NULL) || (xl == NULL)) { ret = -EINVAL; @@ -4228,6 +4237,9 @@ fuse_nameless_lookup (xlator_t *xl, uuid_t gfid, loc_t *loc) goto out; linked_inode = inode_link (loc->inode, NULL, NULL, &iatt); + if (linked_inode == loc->inode) + inode_ctx_set (linked_inode, this, &ctx_value); + inode_unref (loc->inode); loc->inode = linked_inode; @@ -4267,8 +4279,8 @@ fuse_migrate_fd_open (xlator_t *this, fd_t *basefd, fd_t *oldfd, loc.inode = inode_find (new_subvol->itable, basefd->inode->gfid); if (loc.inode == NULL) { - ret = fuse_nameless_lookup (new_subvol, basefd->inode->gfid, - &loc); + ret = fuse_nameless_lookup (this, new_subvol, + basefd->inode->gfid, &loc); if (ret < 0) { gf_log ("glusterfs-fuse", GF_LOG_WARNING, "name-less lookup of gfid (%s) failed (%s)" 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; -- cgit