diff options
Diffstat (limited to 'xlators/cluster')
| -rw-r--r-- | xlators/cluster/stripe/src/stripe.c | 4 | ||||
| -rw-r--r-- | xlators/cluster/stripe/src/stripe.h | 16 |
2 files changed, 15 insertions, 5 deletions
diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c index bda38298fc7..639fbfd8b2c 100644 --- a/xlators/cluster/stripe/src/stripe.c +++ b/xlators/cluster/stripe/src/stripe.c @@ -203,6 +203,8 @@ stripe_entry_self_heal (call_frame_t *frame, xlator_t *this, } out: + if (rframe) + STRIPE_STACK_DESTROY (rframe); if (dict) dict_unref (dict); @@ -3389,6 +3391,8 @@ stripe_readv (call_frame_t *frame, xlator_t *this, fd_t *fd, err: if (local && local->fd) fd_unref (local->fd); + if (rframe) + STRIPE_STACK_DESTROY (rframe); STRIPE_STACK_UNWIND (readv, frame, -1, op_errno, NULL, 0, NULL, NULL); return 0; diff --git a/xlators/cluster/stripe/src/stripe.h b/xlators/cluster/stripe/src/stripe.h index 3dbd93d59f6..6199c006100 100644 --- a/xlators/cluster/stripe/src/stripe.h +++ b/xlators/cluster/stripe/src/stripe.h @@ -44,15 +44,21 @@ frame->local = NULL; \ } \ STACK_UNWIND_STRICT (fop, frame, params); \ - stripe_local_wipe(__local); \ + if (__local) { \ + stripe_local_wipe(__local); \ + GF_FREE (__local); \ + } \ } while (0) #define STRIPE_STACK_DESTROY(frame) do { \ stripe_local_t *__local = NULL; \ - __local = frame->local; \ - frame->local = NULL; \ - STACK_DESTROY (frame->root); \ - stripe_local_wipe (__local); \ + __local = frame->local; \ + frame->local = NULL; \ + STACK_DESTROY (frame->root); \ + if (__local) { \ + stripe_local_wipe (__local); \ + GF_FREE (__local); \ + } \ } while (0) /** |