From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Mar 2011 20:03:31 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec... 
X-Git-Tag: v3.0~1136
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03e4970c10151c5fb25ddd7e9a142d63c6a8d058;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'upstream-linus' of git://git./linux/kernel/git/jlbec/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (39 commits)
  Treat writes as new when holes span across page boundaries
  fs,ocfs2: Move o2net_get_func_run_time under CONFIG_OCFS2_FS_STATS.
  ocfs2/dlm: Move kmalloc() outside the spinlock
  ocfs2: Make the left masklogs compat.
  ocfs2: Remove masklog ML_AIO.
  ocfs2: Remove masklog ML_UPTODATE.
  ocfs2: Remove masklog ML_BH_IO.
  ocfs2: Remove masklog ML_JOURNAL.
  ocfs2: Remove masklog ML_EXPORT.
  ocfs2: Remove masklog ML_DCACHE.
  ocfs2: Remove masklog ML_NAMEI.
  ocfs2: Remove mlog(0) from fs/ocfs2/dir.c
  ocfs2: remove NAMEI from symlink.c
  ocfs2: Remove masklog ML_QUOTA.
  ocfs2: Remove mlog(0) from quota_local.c.
  ocfs2: Remove masklog ML_RESERVATIONS.
  ocfs2: Remove masklog ML_XATTR.
  ocfs2: Remove masklog ML_SUPER.
  ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.c
  ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c
  ...

Fix up trivial conflict in fs/ocfs2/super.c
---

03e4970c10151c5fb25ddd7e9a142d63c6a8d058
diff --cc fs/ocfs2/quota_global.c
index a73f641,64346f8..279aef6
--- a/fs/ocfs2/quota_global.c
+++ b/fs/ocfs2/quota_global.c
@@@ -398,11 -397,12 +395,12 @@@ int ocfs2_global_read_info(struct super
  						OCFS2_QBLK_RESERVED_SPACE;
  	oinfo->dqi_gi.dqi_qtree_depth = qtree_depth(&oinfo->dqi_gi);
  	INIT_DELAYED_WORK(&oinfo->dqi_sync_work, qsync_work_fn);
 -	queue_delayed_work(ocfs2_quota_wq, &oinfo->dqi_sync_work,
 -			   msecs_to_jiffies(oinfo->dqi_syncms));
 +	schedule_delayed_work(&oinfo->dqi_sync_work,
 +			      msecs_to_jiffies(oinfo->dqi_syncms));
  
  out_err:
- 	mlog_exit(status);
+ 	if (status)
+ 		mlog_errno(status);
  	return status;
  out_unlock:
  	ocfs2_unlock_global_qf(oinfo, 0);
diff --cc fs/ocfs2/super.c
index 236ed1b,0e40839..69fa11b
--- 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);