aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/dlmglue.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index 172f4c6ce1be..0cdf63042b76 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,
907 907
908 assert_spin_locked(&lockres->l_lock); 908 assert_spin_locked(&lockres->l_lock);
909 909
910 lockres_or_flags(lockres, OCFS2_LOCK_BLOCKED);
911
912 if (level > lockres->l_blocking) { 910 if (level > lockres->l_blocking) {
913 /* only schedule a downconvert if we haven't already scheduled 911 /* only schedule a downconvert if we haven't already scheduled
914 * one that goes low enough to satisfy the level we're 912 * 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,
921 lockres->l_blocking = level; 919 lockres->l_blocking = level;
922 } 920 }
923 921
922 if (needs_downconvert)
923 lockres_or_flags(lockres, OCFS2_LOCK_BLOCKED);
924
924 mlog_exit(needs_downconvert); 925 mlog_exit(needs_downconvert);
925 return needs_downconvert; 926 return needs_downconvert;
926} 927}