From 9848ac8bf7a6854e9d4dee2dcb53621c67b33d6e Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Wed, 24 Aug 2011 12:49:48 +0530 Subject: features/locks: avoid using reqlock to prevent race Change-Id: Id8613f9641f748f996062342878070ba8fb27339 BUG: 2473 Reviewed-on: http://review.gluster.com/312 Tested-by: Gluster Build System Reviewed-by: Pranith Kumar Karampuri --- xlators/features/locks/src/inodelk.c | 2 +- xlators/features/locks/src/posix.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xlators/features') diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c index 1fd6a7e06..8cd5e0b3e 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -616,7 +616,7 @@ pl_common_inodelk (call_frame_t *frame, xlator_t *this, can_block, dom); if (ret < 0) { - if ((can_block) && (F_UNLCK != reqlock->fl_type)) { + if ((can_block) && (F_UNLCK != flock->l_type)) { pl_trace_block (this, frame, fd, loc, cmd, flock, volume); goto out; diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index e1ec8db02..20f6cdd66 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -1102,7 +1102,7 @@ pl_lk (call_frame_t *frame, xlator_t *this, can_block); if (ret == -1) { - if ((can_block) && (F_UNLCK != reqlock->fl_type)) { + if ((can_block) && (F_UNLCK != flock->l_type)) { pl_trace_block (this, frame, fd, NULL, cmd, flock, NULL); goto out; } -- cgit