summaryrefslogtreecommitdiffstats
path: root/xlators/mount/fuse/src/fuse-bridge.c
diff options
context:
space:
mode:
authorMohammed Rafi KC <rkavunga@redhat.com>2016-01-12 12:54:42 +0530
committerDan Lambright <dlambrig@redhat.com>2016-01-13 19:26:43 -0800
commitad8c65612d6d7e32c06fd3aed11b7a9edd514607 (patch)
tree552f5df1b68124217a65aeac9cd1bba08d0d6ff8 /xlators/mount/fuse/src/fuse-bridge.c
parentca515db012718f2d4998edf682c70ccba29924c6 (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 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> Tested-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'xlators/mount/fuse/src/fuse-bridge.c')
-rw-r--r--xlators/mount/fuse/src/fuse-bridge.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
index eba8a6ddb0c..8ac641d5bca 100644
--- a/xlators/mount/fuse/src/fuse-bridge.c
+++ b/xlators/mount/fuse/src/fuse-bridge.c
@@ -380,6 +380,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;
@@ -429,7 +430,8 @@ 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) {
+ if (linked_inode == inode) {
+ inode_ctx_set (linked_inode, this, &ctx_value);
}
inode_lookup (linked_inode);
@@ -1915,6 +1917,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;
@@ -1950,6 +1953,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);
@@ -4168,12 +4173,13 @@ fuse_first_lookup (xlator_t *this)
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;
@@ -4201,6 +4207,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;
@@ -4240,8 +4249,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)"