From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jan 2012 21:05:29 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.3-rc1~169
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=29ad0de279002f9b6a63df5ba85328f5b633b842

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

29ad0de279002f9b6a63df5ba85328f5b633b842
diff --cc fs/xfs/xfs_sync.c
index f0994aedcd1,5b9ec37a3e0..72c01a1c16e
--- a/fs/xfs/xfs_sync.c
+++ b/fs/xfs/xfs_sync.c
@@@ -385,20 -359,7 +385,17 @@@ xfs_quiesce_data
  {
  	int			error, error2 = 0;
  
 +	/*
 +	 * 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);
 +
- 	xfs_qm_sync(mp, SYNC_TRYLOCK);
- 	xfs_qm_sync(mp, SYNC_WAIT);
- 
- 	/* force out the newly dirtied log buffers */
+ 	/* force out the log */
  	xfs_log_force(mp, XFS_LOG_SYNC);
  
  	/* write superblock and hoover up shutdown errors */