Merge tag 'ecryptfs-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / fs / ocfs2 / dlm / dlmrecovery.c

diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 45067fa..3365839 100644 (file)
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -1710,9 +1710,12 @@ int dlm_master_requery_handler(struct o2net_msg *msg, u32 len, void *data,
                                BUG();
                        } else
                                __dlm_lockres_grab_inflight_worker(dlm, res);
-               } else /* put.. incase we are not the master */
+                       spin_unlock(&res->spinlock);
+               } else {
+                       /* put.. incase we are not the master */
+                       spin_unlock(&res->spinlock);
                        dlm_lockres_put(res);
-               spin_unlock(&res->spinlock);
+               }
        }
        spin_unlock(&dlm->spinlock);