summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra Bhat <raghavendrabhat@gluster.com>2011-08-24 12:49:48 +0530
committerVijay Bellur <vijay@gluster.com>2011-08-24 01:03:05 -0700
commit9848ac8bf7a6854e9d4dee2dcb53621c67b33d6e (patch)
tree69e24287f9120aa6cf4ab5e6785b89df2b626025
parent7f459fc826346c33a58412fb45a6781c5fd1cc0d (diff)
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 <jenkins@build.gluster.com> Reviewed-by: Pranith Kumar Karampuri <pranithk@gluster.com>
-rw-r--r--xlators/features/locks/src/inodelk.c2
-rw-r--r--xlators/features/locks/src/posix.c2
2 files changed, 2 insertions, 2 deletions
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;
}