summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra Bhat <raghavendrabhat@gluster.com>2011-03-27 14:03:10 +0000
committerVijay Bellur <vijay@dev.gluster.com>2011-03-27 22:17:39 -0700
commit408a2b029824a3915ce094aed520061e80c078c8 (patch)
tree8a15e0f19f8be2991b7a10ef9957b9b6e590882e
parent2406e21dd2d63b4ab69d8179d69dae17f0e4a0d9 (diff)
check the local for NULL before accessing itv3.2.0qa5
Signed-off-by: Raghavendra Bhat <raghavendrabhat@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2592 () URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2592
-rw-r--r--xlators/features/marker/src/marker.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c
index 044feea..3a43ffd 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -846,12 +846,12 @@ marker_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
STACK_UNWIND_STRICT (rename, frame, op_ret, op_errno, buf, preoldparent,
postoldparent, prenewparent, postnewparent);
- oplocal = local->oplocal;
- local->oplocal = NULL;
-
if (op_ret == -1 || local == NULL)
goto out;
+ oplocal = local->oplocal;
+ local->oplocal = NULL;
+
priv = this->private;
if (priv->feature_enabled & GF_QUOTA) {