Subject: linux-next: manual merge of the ocfs2 tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 28 Mar 2011 12:00:15 +1100

Hi Joel,

Today's linux-next merge of the ocfs2 tree got a conflict in
fs/ocfs2/super.c between commit 316873c958ee ("ocfs2: use system_wq
instead of ocfs2_quota_wq") from Linus' tree and commit ef6b689b63b9
("ocfs2: Remove ENTRY from masklog") from the ocfs2 tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc fs/ocfs2/super.c
index 236ed1b,0e40839..0000000
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@@ -1662,12 -1654,12 +1650,11 @@@ static int __init ocfs2_init(void
  	status = register_quota_format(&ocfs2_quota_format);
  leave:
  	if (status < 0) {
 -		ocfs2_quota_shutdown();
  		ocfs2_free_mem_caches();
  		exit_ocfs2_uptodate_cache();
+ 		mlog_errno(status);
  	}
  
- 	mlog_exit(status);
- 
  	if (status >= 0) {
  		return register_filesystem(&ocfs2_fs_type);
  	} else
@@@ -1676,8 -1668,8 +1663,6 @@@
  
  static void __exit ocfs2_exit(void)
  {
- 	mlog_entry_void();
- 
 -	ocfs2_quota_shutdown();
 -
  	if (ocfs2_wq) {
  		flush_workqueue(ocfs2_wq);
  		destroy_workqueue(ocfs2_wq);