From 8c5237bbd3a580c9287d18a3e71808e87f1edf9e Mon Sep 17 00:00:00 2001 From: Raghavendra G Date: Sat, 10 Sep 2011 15:17:49 +0530 Subject: features/marker: Use appropriate loc struct to do removexattr on newpath after rename. Change-Id: Idb31e845bc876f46b476d8fa769d67d8db89e4a1 BUG: 3493 Reviewed-on: http://review.gluster.com/389 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/features/marker/src/marker.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index 36ce3d79e..050da8879 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -1054,6 +1054,7 @@ marker_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this, call_stub_t *stub = NULL; int32_t ret = 0; char contri_key [512] = {0, }; + loc_t newloc = {0, }; local = (marker_local_t *) frame->local; @@ -1099,10 +1100,21 @@ marker_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this, */ MARKER_SET_UID_GID (frame, local, frame->root); + newloc.inode = inode_ref (oplocal->loc.inode); + newloc.path = gf_strdup (local->loc.path); + newloc.name = strrchr (newloc.path, '/'); + if (newloc.name) + newloc.name++; + + newloc.parent = inode_ref (local->loc.parent); + newloc.ino = oplocal->loc.inode->ino; + STACK_WIND (frame, marker_rename_release_oldp_lock, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->removexattr, &local->loc, + FIRST_CHILD(this)->fops->removexattr, &newloc, contri_key); + + loc_wipe (&newloc); } else { frame->local = NULL; -- cgit