Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

* '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

diff --cc fs/ocfs2/acl.c
Simple merge

diff --cc fs/ocfs2/aops.c
Simple merge

diff --cc fs/ocfs2/cluster/heartbeat.c
Simple merge

diff --cc fs/ocfs2/dir.c
Simple merge

diff --cc fs/ocfs2/ioctl.c
Simple merge

diff --cc fs/ocfs2/namei.c
Simple merge

diff --cc fs/ocfs2/ocfs2.h
Simple merge

diff --cc fs/ocfs2/quota_global.c
index a73f641664818e2a6c93d30d192b3a70303fecee,64346f836c09158fc9891d99077594cbc5718bc7..279aef68025b3155f7e9efccd5b63409927deae3
--- 1/fs/ocfs2/quota_global.c
--- 2/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/refcounttree.c
Simple merge

diff --cc fs/ocfs2/super.c
index 236ed1bdca2c5aa39e3140f490f5ba644610ec05,0e4083987d2bf8c0b3daed879041a0e4df1af9dd..69fa11b35aa4ccd821729a0460d68d7b1ee72d83
--- 1/fs/ocfs2/super.c
--- 2/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);

diff --cc fs/ocfs2/xattr.c
Simple merge