diff options
| author | Wengang Wang <wen.gang.wang@oracle.com> | 2010-01-21 18:50:02 (GMT) |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-02-03 07:50:55 (GMT) |
| commit | 0b94a909eb2e2f6990d05fd486a0cb4902ef1ae7 (patch) | |
| tree | 197c4da141781f52f72fe4f28e0e82e9432500b1 | |
| parent | 34e6c59af06cbca07b1490ec0015ea2d303470d3 (diff) | |
| download | linux-0b94a909eb2e2f6990d05fd486a0cb4902ef1ae7.tar.xz | |
ocfs2: Fix setting of OCFS2_LOCK_BLOCKED during bast
During bast, set the OCFS2_LOCK_BLOCKED flag only if the lock needs to
downconverted.
Signed-off-by: Wengang Wang <wen.gang.wang@oracle.com>
Acked-by: Sunil Mushran <sunil.mushran@oracle.com>
Acked-by: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
| -rw-r--r-- | fs/ocfs2/dlmglue.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 172f4c6..0cdf630 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c @@ -907,8 +907,6 @@ static int ocfs2_generic_handle_bast(struct ocfs2_lock_res *lockres, assert_spin_locked(&lockres->l_lock); - lockres_or_flags(lockres, OCFS2_LOCK_BLOCKED); - if (level > lockres->l_blocking) { /* only schedule a downconvert if we haven't already scheduled * one that goes low enough to satisfy the level we're @@ -921,6 +919,9 @@ static int ocfs2_generic_handle_bast(struct ocfs2_lock_res *lockres, lockres->l_blocking = level; } + if (needs_downconvert) + lockres_or_flags(lockres, OCFS2_LOCK_BLOCKED); + mlog_exit(needs_downconvert); return needs_downconvert; } |