diff options
| author | mohit84 <moagrawa@redhat.com> | 2020-11-17 12:41:57 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 12:41:57 +0530 |
| commit | 438fc46c0bef91019483962dfec56a5520158058 (patch) | |
| tree | 277ebe3061af8f5b6527fe471d4237d5bd3b1ec2 | |
| parent | b8ad18a260bf1fb34af92bd948df9142e0a08f51 (diff) | |
| download | glusterfs-438fc46c0bef91019483962dfec56a5520158058.tar.gz glusterfs-438fc46c0bef91019483962dfec56a5520158058.tar.xz glusterfs-438fc46c0bef91019483962dfec56a5520158058.zip | |
afr: call afr_is_lock_mode_mandatory only while xdata is valid (#1797)
afr_is_lock_mode_mandatory throws a warning message while xdata
is not valid, to avoid a message call a function only while xdata
is valid.
Fixes: #1796
Change-Id: I32d37960ea4e936ba87e65811c1792a2f1158c0d
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
| -rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 7d525fb8f5..4b708b3aee 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -5347,17 +5347,17 @@ afr_lk(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd, local->cont.lk.cmd = cmd; local->cont.lk.user_flock = *flock; local->cont.lk.ret_flock = *flock; - if (xdata) + if (xdata) { local->xdata_req = dict_ref(xdata); - - if (afr_is_lock_mode_mandatory(xdata)) { - ret = synctask_new(this->ctx->env, afr_lk_transaction, - afr_lk_transaction_cbk, frame, frame); - if (ret) { - op_errno = ENOMEM; - goto out; + if (afr_is_lock_mode_mandatory(xdata)) { + ret = synctask_new(this->ctx->env, afr_lk_transaction, + afr_lk_transaction_cbk, frame, frame); + if (ret) { + op_errno = ENOMEM; + goto out; + } + return 0; } - return 0; } STACK_WIND_COOKIE(frame, afr_lk_cbk, (void *)(long)0, priv->children[i], |