diff --git a/[refs] b/[refs] index fedcb3b68335..afa432b68b10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1cd04dbe3364be71b93e3aaf4545daa1e261aaa1 +refs/heads/master: 50635f15b324cbf45a58f103e6b4c7e42502b683 diff --git a/trunk/fs/ocfs2/dlm/dlmrecovery.c b/trunk/fs/ocfs2/dlm/dlmrecovery.c index f93315c98871..2e32fe65c6c2 100644 --- a/trunk/fs/ocfs2/dlm/dlmrecovery.c +++ b/trunk/fs/ocfs2/dlm/dlmrecovery.c @@ -1908,11 +1908,9 @@ static int dlm_process_recovery_data(struct dlm_ctxt *dlm, 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);