summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2011-07-14 01:04:31 +0000
committerAnand Avati <avati@gluster.com>2011-07-13 23:50:14 -0700
commitc82a9d438bc47e9dff2047df1012cdd0653cffca (patch)
tree28657174b9ff6ab1c0bd223480a5329aff669724
parent972c4a3c347c2581de0e9d0fce6d5c1804eaa974 (diff)
features/locks: Avoid using reqlock to prevent racev3.2.2qa8v3.2.2
Signed-off-by: Vijay Bellur <vijay@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2473 (Support for volume and directory level quota) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2473
-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 81cd267..667d0d8 100644
--- a/xlators/features/locks/src/inodelk.c
+++ b/xlators/features/locks/src/inodelk.c
@@ -615,7 +615,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 f8f2648..67c1c7c 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;
}