From 3eafe6a81fecc493e60f3781246daefbf4393602 Mon Sep 17 00:00:00 2001 From: Sachin Pandit Date: Thu, 4 Jun 2015 11:01:38 +0530 Subject: features/marker : Pass along xdata to lower translator The problem was in marker xlator, where during rename a NULL value is passed during STACK_WIND. Marker needs to pass the xdata un-modified to next translator if marker does not rely on that. Change-Id: I9e47e504fd241263987645abfed7ca13c0d54a80 BUG: 1228492 Signed-off-by: Sachin Pandit Reviewed-on: http://review.gluster.org/11089 Tested-by: Gluster Build System Reviewed-by: Raghavendra G Tested-by: Raghavendra G --- xlators/features/marker/src/marker.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'xlators/features/marker/src/marker.c') diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index f28b112cc29..2943f3b067d 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -1334,7 +1334,7 @@ marker_do_rename (call_frame_t *frame, void *cookie, xlator_t *this, STACK_WIND (frame, marker_rename_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->rename, &oplocal->loc, - &local->loc, NULL); + &local->loc, local->xdata); return 0; @@ -1591,6 +1591,8 @@ marker_rename (call_frame_t *frame, xlator_t *this, loc_t *oldloc, lock.l_type = F_WRLCK; lock.l_whence = SEEK_SET; + local->xdata = dict_ref (xdata); + STACK_WIND (frame, marker_rename_inodelk_cbk, FIRST_CHILD(this), -- cgit