Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs: (22 commits)
  xfs: mark the xfssyncd workqueue as non-reentrant
  xfs: simplify xfs_qm_detach_gdquots
  xfs: fix acl count validation in xfs_acl_from_disk()
  xfs: remove unused XBT_FORCE_SLEEP bit
  xfs: remove XFS_QMOPT_DQSUSER
  xfs: kill xfs_qm_idtodq
  xfs: merge xfs_qm_dqinit_core into the only caller
  xfs: add a xfs_dqhold helper
  xfs: simplify xfs_qm_dqattach_grouphint
  xfs: nest qm_dqfrlist_lock inside the dquot qlock
  xfs: flatten the dquot lock ordering
  xfs: implement lazy removal for the dquot freelist
  xfs: remove XFS_DQ_INACTIVE
  xfs: cleanup xfs_qm_dqlookup
  xfs: cleanup dquot locking helpers
  xfs: remove the sync_mode argument to xfs_qm_dqflush_all
  xfs: remove xfs_qm_sync
  xfs: make sure to really flush all dquots in xfs_qm_quotacheck
  xfs: untangle SYNC_WAIT and SYNC_TRYLOCK meanings for xfs_qm_dqflush
  xfs: remove the lid_size field in struct log_item_desc
  ...

Fix up trivial conflict in fs/xfs/xfs_sync.c

1 files changed, 10 insertions, 26 deletions

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 7b7669507ee3..281961c1d81a 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -199,7 +199,6 @@ xfs_parseargs(
         mp->m_flags |= XFS_MOUNT_BARRIER;
         mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;
         mp->m_flags |= XFS_MOUNT_SMALL_INUMS;
-        mp->m_flags |= XFS_MOUNT_DELAYLOG;
 
         /*
          * These can be overridden by the mount option parsing.
@@ -353,11 +352,11 @@ xfs_parseargs(
                         mp->m_qflags |= (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE);
                         mp->m_qflags &= ~XFS_OQUOTA_ENFD;
                 } else if (!strcmp(this_char, MNTOPT_DELAYLOG)) {
-                        mp->m_flags |= XFS_MOUNT_DELAYLOG;
+                        xfs_warn(mp,
+        "delaylog is the default now, option is deprecated.");
                 } else if (!strcmp(this_char, MNTOPT_NODELAYLOG)) {
-                        mp->m_flags &= ~XFS_MOUNT_DELAYLOG;
                         xfs_warn(mp,
-        "nodelaylog is deprecated and will be removed in Linux 3.3");
+        "nodelaylog support has been removed, option is deprecated.");
                 } else if (!strcmp(this_char, MNTOPT_DISCARD)) {
                         mp->m_flags |= XFS_MOUNT_DISCARD;
                 } else if (!strcmp(this_char, MNTOPT_NODISCARD)) {
@@ -395,13 +394,6 @@ xfs_parseargs(
                 return EINVAL;
         }
 
-        if ((mp->m_flags & XFS_MOUNT_DISCARD) &&
-            !(mp->m_flags & XFS_MOUNT_DELAYLOG)) {
-                xfs_warn(mp,
-        "the discard option is incompatible with the nodelaylog option");
-                return EINVAL;
-        }
-
 #ifndef CONFIG_XFS_QUOTA
         if (XFS_IS_QUOTA_RUNNING(mp)) {
                 xfs_warn(mp, "quota support not available in this kernel.");
@@ -501,7 +493,6 @@ xfs_showargs(
                 { XFS_MOUNT_ATTR2,              "," MNTOPT_ATTR2 },
                 { XFS_MOUNT_FILESTREAMS,        "," MNTOPT_FILESTREAM },
                 { XFS_MOUNT_GRPID,              "," MNTOPT_GRPID },
-                { XFS_MOUNT_DELAYLOG,           "," MNTOPT_DELAYLOG },
                 { XFS_MOUNT_DISCARD,            "," MNTOPT_DISCARD },
                 { 0, NULL }
         };
@@ -1014,17 +1005,10 @@ xfs_fs_sync_fs(
         int                     error;
 
         /*
-         * Not much we can do for the first async pass.  Writing out the
-         * superblock would be counter-productive as we are going to redirty
-         * when writing out other data and metadata (and writing out a single
-         * block is quite fast anyway).
-         *
-         * Try to asynchronously kick off quota syncing at least.
+         * Doing anything during the async pass would be counterproductive.
          */
-        if (!wait) {
-                xfs_qm_sync(mp, SYNC_TRYLOCK);
+        if (!wait)
                 return 0;
-        }
 
         error = xfs_quiesce_data(mp);
         if (error)
@@ -1621,12 +1605,12 @@ STATIC int __init
 xfs_init_workqueues(void)
 {
         /*
-         * max_active is set to 8 to give enough concurency to allow
-         * multiple work operations on each CPU to run. This allows multiple
-         * filesystems to be running sync work concurrently, and scales with
-         * the number of CPUs in the system.
+         * We never want to the same work item to run twice, reclaiming inodes
+         * or idling the log is not going to get any faster by multiple CPUs
+         * competing for ressources.  Use the default large max_active value
+         * so that even lots of filesystems can perform these task in parallel.
          */
-        xfs_syncd_wq = alloc_workqueue("xfssyncd", WQ_CPU_INTENSIVE, 8);
+        xfs_syncd_wq = alloc_workqueue("xfssyncd", WQ_NON_REENTRANT, 0);
         if (!xfs_syncd_wq)
                 return -ENOMEM;
         return 0;