Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d92bc5127b27f315ef0ef2c1e1829fd6a5cba54a

Authored by Coly Li
Committed by Joel Becker
1 parent a2f2ddbf2b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

dlmglue.c: add missed mlog lines 

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>

Showing 1 changed file with 4 additions and 1 deletions Side-by-side Diff

... ... @@ -1577,8 +1577,10 @@
1577 1577 (unsigned long long)OCFS2_I(inode)->ip_blkno,
1578 1578 write ? "EXMODE" : "PRMODE");
1579 1579  
1580   - if (ocfs2_mount_local(osb))
  1580 + if (ocfs2_mount_local(osb)) {
  1581 + mlog_exit(0);
1581 1582 return 0;
  1583 + }
1582 1584  
1583 1585 lockres = &OCFS2_I(inode)->ip_rw_lockres;
1584 1586  
... ... @@ -3038,6 +3040,7 @@
3038 3040 "unlock_action %d\n", error, lockres->l_name,
3039 3041 lockres->l_unlock_action);
3040 3042 spin_unlock_irqrestore(&lockres->l_lock, flags);
  3043 + mlog_exit_void();
3041 3044 return;
3042 3045 }
3043 3046