From eeab758c7c7e7670f86fc1d8c3785a1ecb7208b4 Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Tue, 8 Jul 2014 13:05:15 +0530 Subject: features/gfid-access: error handling for entry creation Proceed with setattr() only on a successfull entry creation. Winding a setattr() using a freshlyOC initiated inode would most likely fail in one translator or the other (e.g. DHT expecting the layout information to be set in the inode context), which is the case if the inode was not looked up. Therefore, gfid-access handles failure entry creations and passes the _correct_ errno back to the client instead of continuing with setattr() call and probably returning back incorrect errno. Also, filling up inode->gfid is required as the new inode is not looked up and ->gfid would be certainely required for inode operations. Change-Id: Ie92f5647a89bf558c07710ab0400bce69d59fc31 BUG: 1111490 Signed-off-by: Venky Shankar Reviewed-on: http://review.gluster.org/8260 Tested-by: Gluster Build System Reviewed-by: Kotresh HR Reviewed-by: Vijay Bellur --- xlators/features/gfid-access/src/gfid-access.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'xlators/features/gfid-access/src') diff --git a/xlators/features/gfid-access/src/gfid-access.c b/xlators/features/gfid-access/src/gfid-access.c index 52c137c342f..a5869f82187 100644 --- a/xlators/features/gfid-access/src/gfid-access.c +++ b/xlators/features/gfid-access/src/gfid-access.c @@ -313,8 +313,10 @@ ga_fill_tmp_loc (loc_t *loc, xlator_t *this, uuid_t gfid, new_loc->parent = inode_ref (parent); new_loc->inode = inode_grep (parent->table, parent, bname); - if (!new_loc->inode) + if (!new_loc->inode) { new_loc->inode = inode_new (parent->table); + uuid_copy (new_loc->inode->gfid, gfid); + } loc_path (new_loc, bname); if (new_loc->path) { @@ -434,6 +436,10 @@ ga_newentry_cbk (call_frame_t *frame, void *cookie, xlator_t *this, local = frame->local; + /* no need to proceed if things don't look good here */ + if (op_ret == -1) + goto done; + if (!local->uid && !local->gid) goto done; -- cgit