aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorKurt Hackel <kurt.hackel@oracle.com>2007-01-17 14:54:39 -0800
committerMark Fasheh <mark.fasheh@oracle.com>2007-02-07 12:03:42 -0800
commit50635f15b324cbf45a58f103e6b4c7e42502b683 (patch)
tree3290a045d567312773ffbe96c8b3220f06658dc5 /fs/ocfs2
parentocfs2_dlm: Flush dlm workqueue before starting to migrate (diff)
downloadlinux-dev-50635f15b324cbf45a58f103e6b4c7e42502b683.tar.xz
linux-dev-50635f15b324cbf45a58f103e6b4c7e42502b683.zip
ocfs2_dlm: Drop inflight refmap even if no locks found on the lockres
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com> Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/dlm/dlmrecovery.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index f93315c98871..2e32fe65c6c2 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -1908,11 +1908,9 @@ skip_lvb:
leave:
/* balance the ref taken when the work was queued */
- if (added > 0) {
- spin_lock(&res->spinlock);
- dlm_lockres_drop_inflight_ref(dlm, res);
- spin_unlock(&res->spinlock);
- }
+ spin_lock(&res->spinlock);
+ dlm_lockres_drop_inflight_ref(dlm, res);
+ spin_unlock(&res->spinlock);
if (ret < 0) {
mlog_errno(ret);