From 6e2dba2c418cd09206b390fad0f413fc287b93ee Mon Sep 17 00:00:00 2001 From: Vikas Gorur Date: Thu, 29 Oct 2009 09:09:15 +0000 Subject: protocol/server, mount/fuse: Handle returned inode in create properly Check if linked_inode is different from returned inode in create, and if so, make the fd point to the correct inode. Signed-off-by: Vikas Gorur Signed-off-by: Anand V. Avati BUG: 347 (Assertion failed: inode->ref) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=347 --- xlators/mount/fuse/src/fuse-bridge.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'xlators/mount') diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index b8a91fa0a..5e7e1f4d4 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -1677,22 +1677,29 @@ fuse_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this, buf->st_blksize = this->ctx->page_size; stat2attr (buf, &feo.attr); - inode_link (inode, state->loc.parent, - state->loc.name, buf); - linked_inode = inode; + linked_inode = inode_link (inode, state->loc.parent, + state->loc.name, buf); if (linked_inode != inode) { - gf_log ("glusterfs-fuse", GF_LOG_ERROR, + gf_log ("glusterfs-fuse", GF_LOG_DEBUG, "create(%s) inode (ptr=%p, ino=%"PRId64", " "gen=%"PRId64") found conflict (ptr=%p, " "ino=%"PRId64", gen=%"PRId64")", state->loc.path, inode, inode->ino, inode->generation, linked_inode, linked_inode->ino, linked_inode->generation); + + /* + VERY racy code (if used anywhere else) + -- don't do this without understanding + */ + inode_unref (fd->inode); + fd->inode = inode_ref (linked_inode); } - inode_unref (linked_inode); - inode_lookup (inode); + inode_lookup (linked_inode); + + inode_unref (linked_inode); fd_ref (fd); -- cgit