Merge branch 'akpm' (patches from Andrew Morton)

[mirror_ubuntu-artful-kernel.git] / fs / ocfs2 / dlmglue.c

diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index 6bd690b5a0613b8dc65143bdbd036968b592c8f3..52cfe99ae0565f20295139f543cf2a3d490eeeb2 100644 (file)
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -2544,11 +2544,6 @@ int ocfs2_super_lock(struct ocfs2_super *osb,
         * refreshed, so we do it here. Of course, making sense of
         * everything is up to the caller :) */
        status = ocfs2_should_refresh_lock_res(lockres);
-       if (status < 0) {
-               ocfs2_cluster_unlock(osb, lockres, level);
-               mlog_errno(status);
-               goto bail;
-       }
        if (status) {
                status = ocfs2_refresh_slot_info(osb);