From c6b635d5b2326075549f74d1d81f408f2f7d2d4a Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Fri, 17 Mar 2017 13:14:51 +0530 Subject: libglusterfs/stack.h: reduce duplication of code * Use STACK_UNWIND_STRICT everywhere. * Provide STACK_WIND_COMMON as both STACK_WIND_COOKIE and STACK_WIND differ by just 1 line and 1 option. Updates gluster/glusterfs#137 Change-Id: Ifbb6b9c4702b02f4a02834824f509fd10c78f0ce Signed-off-by: Amar Tumballi Reviewed-on: https://review.gluster.org/16915 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Jeff Darcy --- xlators/features/bit-rot/src/stub/bit-rot-stub.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xlators') diff --git a/xlators/features/bit-rot/src/stub/bit-rot-stub.c b/xlators/features/bit-rot/src/stub/bit-rot-stub.c index 7b6f7796596..4ff897d5c86 100644 --- a/xlators/features/bit-rot/src/stub/bit-rot-stub.c +++ b/xlators/features/bit-rot/src/stub/bit-rot-stub.c @@ -1461,7 +1461,7 @@ br_stub_listxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, br_stub_remove_vxattrs (xattr); unwind: - STACK_UNWIND (frame, op_ret, op_errno, xattr, xdata); + STACK_UNWIND_STRICT (getxattr, frame, op_ret, op_errno, xattr, xdata); return 0; } @@ -1627,7 +1627,7 @@ br_stub_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, br_stub_remove_vxattrs (xattr); unwind: - STACK_UNWIND (frame, op_ret, op_errno, xattr, xdata); + STACK_UNWIND_STRICT (getxattr, frame, op_ret, op_errno, xattr, xdata); if (local) { br_stub_cleanup_local (local); br_stub_dealloc_local (local); @@ -1667,7 +1667,7 @@ br_stub_send_stub_init_time (call_frame_t *frame, xlator_t *this) op_ret = sizeof (br_stub_init_t); unwind: - STACK_UNWIND (frame, op_ret, op_errno, xattr, NULL); + STACK_UNWIND_STRICT (getxattr, frame, op_ret, op_errno, xattr, NULL); if (xattr) dict_unref (xattr); @@ -1754,7 +1754,7 @@ br_stub_getxattr (call_frame_t *frame, xlator_t *this, FIRST_CHILD (this)->fops->getxattr, loc, name, xdata); return 0; unwind: - STACK_UNWIND (frame, op_ret, op_errno, NULL, NULL); + STACK_UNWIND_STRICT (getxattr, frame, op_ret, op_errno, NULL, NULL); return 0; } @@ -1832,7 +1832,7 @@ br_stub_fgetxattr (call_frame_t *frame, xlator_t *this, FIRST_CHILD (this)->fops->fgetxattr, fd, name, xdata); return 0; unwind: - STACK_UNWIND (frame, op_ret, op_errno, NULL, NULL); + STACK_UNWIND_STRICT (fgetxattr, frame, op_ret, op_errno, NULL, NULL); return 0; } -- cgit