]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
dlmglue.c: add missed mlog lines
authorColy Li <coly.li@suse.de>
Fri, 28 Aug 2009 11:03:18 +0000 (19:03 +0800)
committerJoel Becker <joel.becker@oracle.com>
Wed, 23 Sep 2009 08:54:47 +0000 (01:54 -0700)
This patch adds the missed mlog_exit() and mlog_exit_void() lines when routines
return.

Signed-off-by: Coly Li <coly.li@suse.de>
Acked-by: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
fs/ocfs2/dlmglue.c

index bb2fc6993e2a1d43debb7f55533df7f0b94d9940..0d38d67194cbb07aeae46432a9d07825568afb81 100644 (file)
@@ -1577,8 +1577,10 @@ int ocfs2_rw_lock(struct inode *inode, int write)
             (unsigned long long)OCFS2_I(inode)->ip_blkno,
             write ? "EXMODE" : "PRMODE");
 
-       if (ocfs2_mount_local(osb))
+       if (ocfs2_mount_local(osb)) {
+               mlog_exit(0);
                return 0;
+       }
 
        lockres = &OCFS2_I(inode)->ip_rw_lockres;
 
@@ -3038,6 +3040,7 @@ static void ocfs2_unlock_ast(void *opaque, int error)
                     "unlock_action %d\n", error, lockres->l_name,
                     lockres->l_unlock_action);
                spin_unlock_irqrestore(&lockres->l_lock, flags);
+               mlog_exit_void();
                return;
        }