diff options
author | Atin Mukherjee <amukherj@redhat.com> | 2019-04-16 22:14:47 +0530 |
---|---|---|
committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2019-04-17 08:17:29 +0000 |
commit | 785f3276d2e325a991b64aed66a326ea95fffef3 (patch) | |
tree | 0ccd327225b01e4d3eba2d26051dfe6ff7f335df /xlators/features/locks/src/entrylk.c | |
parent | b922793588ad23a9b12ce65abd29e8f45ac87998 (diff) | |
download | glusterfs-785f3276d2e325a991b64aed66a326ea95fffef3.tar.gz glusterfs-785f3276d2e325a991b64aed66a326ea95fffef3.tar.xz glusterfs-785f3276d2e325a991b64aed66a326ea95fffef3.zip |
Revert "features/locks: error-out {inode,entry}lk fops with all-zero lk-owner"
This reverts commit 3883887427a7f2dc458a9773e05f7c8ce8e62301 as it has
broken sdfs-sanity.t.
Updates: bz#1624701
Change-Id: Icb2b0d6bfcce4d556f1cd0f11695c03ffc138736
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'xlators/features/locks/src/entrylk.c')
-rw-r--r-- | xlators/features/locks/src/entrylk.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c index 9d6a4c9305..ced5eca274 100644 --- a/xlators/features/locks/src/entrylk.c +++ b/xlators/features/locks/src/entrylk.c @@ -39,20 +39,13 @@ __pl_entrylk_ref(pl_entry_lock_t *lock) static pl_entry_lock_t * new_entrylk_lock(pl_inode_t *pinode, const char *basename, entrylk_type type, - const char *domain, call_frame_t *frame, char *conn_id, - int32_t *op_errno) + const char *domain, call_frame_t *frame, char *conn_id) { pl_entry_lock_t *newlock = NULL; - if (!pl_is_lk_owner_valid(&frame->root->lk_owner, frame->root->client)) { - *op_errno = EINVAL; - goto out; - } - newlock = GF_CALLOC(1, sizeof(pl_entry_lock_t), gf_locks_mt_pl_entry_lock_t); if (!newlock) { - *op_errno = ENOMEM; goto out; } @@ -800,9 +793,10 @@ pl_common_entrylk(call_frame_t *frame, xlator_t *this, const char *volume, entrylk_trace_in(this, frame, volume, fd, loc, basename, cmd, type); reqlock = new_entrylk_lock(pinode, basename, type, dom->domain, frame, - conn_id, &op_errno); + conn_id); if (!reqlock) { op_ret = -1; + op_errno = ENOMEM; goto unwind; } |