diff options
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-data.c | 2 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.h | 16 | 
2 files changed, 17 insertions, 1 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c index bee7682a23b..25e310fd2a3 100644 --- a/xlators/cluster/afr/src/afr-self-heal-data.c +++ b/xlators/cluster/afr/src/afr-self-heal-data.c @@ -176,6 +176,8 @@ __afr_selfheal_data_read_write (call_frame_t *frame, xlator_t *this, fd_t *fd,  			healed_sinks[i] = 0;  		}  	} +        if (iovec) +                GF_FREE (iovec);  	if (iobref)  		iobref_unref (iobref); diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index cca964d9178..4b894c5c464 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -897,7 +897,21 @@ afr_cleanup_fd_ctx (xlator_t *this, fd_t *fd);  		frame->local = NULL; };				       \  	frame->local;}) -#define AFR_STACK_RESET(frame) do { int opr; STACK_RESET (frame->root); AFR_FRAME_INIT(frame, opr);} while (0) +#define AFR_STACK_RESET(frame)                                         \ +        do {                                                           \ +                afr_local_t *__local = NULL;                           \ +                xlator_t    *__this = NULL;                            \ +                __local = frame->local;                                \ +                __this = frame->this;                                  \ +                frame->local = NULL;                                   \ +                int __opr;                                             \ +                STACK_RESET (frame->root);                             \ +                if (__local) {                                         \ +                        afr_local_cleanup (__local, __this);           \ +                        mem_put (__local);                             \ +                }                                                      \ +                AFR_FRAME_INIT (frame, __opr);                         \ +        } while (0)  /* allocate and return a string that is the basename of argument */  static inline char *  | 
