diff options
Diffstat (limited to 'xlators/cluster/afr/src')
| -rw-r--r-- | xlators/cluster/afr/src/afr-inode-read.c | 2 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.c | 8 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.h | 32 |
3 files changed, 22 insertions, 20 deletions
diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c index b1bbac10bc2..ef72fb19779 100644 --- a/xlators/cluster/afr/src/afr-inode-read.c +++ b/xlators/cluster/afr/src/afr-inode-read.c @@ -802,7 +802,7 @@ afr_readv_cbk (call_frame_t *frame, void *cookie, out: if (unwind) { - if (buf) + if (buf && local) buf->ia_ino = local->cont.readv.ino; AFR_STACK_UNWIND (readv, frame, op_ret, op_errno, diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c index 718384717e4..4ae128bbb55 100644 --- a/xlators/cluster/afr/src/afr.c +++ b/xlators/cluster/afr/src/afr.c @@ -2744,7 +2744,7 @@ init (xlator_t *this) int32_t background_count = 0; int32_t lock_server_count = 1; - int32_t window_size; + int32_t window_size = 0; int fav_ret = -1; int read_ret = -1; @@ -2780,8 +2780,8 @@ init (xlator_t *this) &background_count); if (dict_ret == 0) { gf_log (this->name, GF_LOG_DEBUG, - "Setting background self-heal count to %d.", - window_size); + "Setting background self-heal count to %d", + background_count); priv->background_self_heal_count = background_count; } @@ -2819,7 +2819,7 @@ init (xlator_t *this) &window_size); if (dict_ret == 0) { gf_log (this->name, GF_LOG_DEBUG, - "Setting data self-heal window size to %d.", + "Setting data self-heal window size to %d", window_size); priv->data_self_heal_window_size = window_size; diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index b223a9de3c0..4580bcda278 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -558,15 +558,15 @@ typedef struct { /* try alloc and if it fails, goto label */ -#define ALLOC_OR_GOTO(var, type, label) do { \ - var = GF_CALLOC (sizeof (type), 1, \ - gf_afr_mt_##type); \ - if (!var) { \ - gf_log (this->name, GF_LOG_ERROR, \ - "out of memory :("); \ - op_errno = ENOMEM; \ - goto label; \ - } \ +#define ALLOC_OR_GOTO(var, type, label) do { \ + var = GF_CALLOC (sizeof (type), 1, \ + gf_afr_mt_##type); \ + if (!var) { \ + gf_log (this->name, GF_LOG_ERROR, \ + "out of memory :("); \ + op_errno = ENOMEM; \ + goto label; \ + } \ } while (0); @@ -639,13 +639,15 @@ afr_cleanup_fd_ctx (xlator_t *this, fd_t *fd); do { \ afr_local_t *__local = NULL; \ xlator_t *__this = NULL; \ - __local = frame->local; \ - __this = frame->this; \ - frame->local = NULL; \ + if (frame) { \ + __local = frame->local; \ + __this = frame->this; \ + frame->local = NULL; \ + } \ STACK_UNWIND_STRICT (fop, frame, params); \ - afr_local_cleanup (__local, __this); \ + afr_local_cleanup (__local, __this); \ GF_FREE (__local); \ -} while (0); + } while (0); #define AFR_STACK_DESTROY(frame) \ do { \ @@ -657,7 +659,7 @@ afr_cleanup_fd_ctx (xlator_t *this, fd_t *fd); STACK_DESTROY (frame->root); \ afr_local_cleanup (__local, __this); \ GF_FREE (__local); \ -} while (0); + } while (0); /* allocate and return a string that is the basename of argument */ static inline char * |