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

diff --cc fs/xfs/xfs_super.c
Simple merge

diff --cc fs/xfs/xfs_sync.c
index f0994aedcd158c2db3d6f9b2bf4d21a4f819bec6,5b9ec37a3e0734602fde55a8efb7c0b7f8e8be08..72c01a1c16e7d16ca0a49e284addf7d884dbfea6
--- 1/fs/xfs/xfs_sync.c
--- 2/fs/xfs/xfs_sync.c
+++ b/fs/xfs/xfs_sync.c
@@@ -385,20 -359,7 +385,17 @@@ xfs_quiesce_data
  {
        int                     error, error2 = 0;
  
-       xfs_qm_sync(mp, SYNC_TRYLOCK);
-       xfs_qm_sync(mp, SYNC_WAIT);
- 
-       /* force out the newly dirtied log buffers */
 +      /*
 +       * Log all pending size and timestamp updates.  The vfs writeback
 +       * code is supposed to do this, but due to its overagressive
 +       * livelock detection it will skip inodes where appending writes
 +       * were written out in the first non-blocking sync phase if their
 +       * completion took long enough that it happened after taking the
 +       * timestamp for the cut-off in the blocking phase.
 +       */
 +      xfs_inode_ag_iterator(mp, xfs_log_dirty_inode, 0);
 +
+       /* force out the log */
        xfs_log_force(mp, XFS_LOG_SYNC);
  
        /* write superblock and hoover up shutdown errors */