Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be97d9d5 authored by David Chinner's avatar David Chinner Committed by Lachlan McIlroy
Browse files

[XFS] make SYNC_ATTR no longer use xfs_sync 



Continue to de-multiplex xfs_sync be replacing all SYNC_ATTR callers with
direct calls xfs_sync_inodes(). Add an assert into xfs_sync() to ensure we
caught all the SYNC_ATTR callers.

SGI-PV: 988140

SGI-Modid: xfs-linux-melb:xfs-kern:32308a

Signed-off-by: default avatarDavid Chinner <david@fromorbit.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
parent aacaa880

fs/xfs/linux-2.6/xfs_super.c

+2 −1
Original line number Diff line number Diff line
@@ -998,7 +998,8 @@ xfs_fs_put_super( 
	int			error;



	xfs_syncd_stop(mp);

	xfs_sync(mp, SYNC_ATTR | SYNC_DELWRI);

	xfs_log_force(mp, 0, XFS_LOG_FORCE|XFS_LOG_SYNC);

	xfs_sync_inodes(mp, SYNC_ATTR|SYNC_DELWRI);



#ifdef HAVE_DMAPI

	if (mp->m_flags & XFS_MOUNT_DMAPI) {

fs/xfs/linux-2.6/xfs_sync.c

+11 −12
Original line number Diff line number Diff line
@@ -342,9 +342,8 @@ xfs_sync_fsdata( 
 *		       periodically.  We also push the inodes and

 *		       superblock if we can lock them without sleeping

 *			and they are not pinned.

 *      SYNC_ATTR    - We need to flush the inodes.  If SYNC_BDFLUSH is not

 *		       set, then we really want to lock each inode and flush

 *		       it.

 *      SYNC_ATTR    - We need to flush the inodes. Now handled by direct calls

 *		       to xfs_sync_inodes().

 *      SYNC_WAIT    - All the flushes that take place in this call should

 *		       be synchronous.

 *      SYNC_DELWRI  - This tells us to push dirty pages associated with
@@ -373,6 +372,8 @@ xfs_sync( 
	int		last_error = 0;

	uint		log_flags = XFS_LOG_FORCE;



	ASSERT(!(flags & SYNC_ATTR));



	/*

	 * Get the Quota Manager to flush the dquots.

	 *
@@ -403,20 +404,18 @@ xfs_sync( 


	xfs_log_force(mp, (xfs_lsn_t)0, log_flags);



	if (flags & (SYNC_ATTR|SYNC_DELWRI)) {

	if (flags & SYNC_DELWRI) {

		if (flags & SYNC_BDFLUSH)

			xfs_finish_reclaim_all(mp, 1, XFS_IFLUSH_DELWRI_ELSE_ASYNC);

		else

			error = xfs_sync_inodes(mp, flags);

	}



		/*

		 * Flushing out dirty data above probably generated more

		 * log activity, so if this isn't vfs_sync() then flush

		 * the log again.

		 */

	if (flags & SYNC_DELWRI)

		xfs_log_force(mp, 0, log_flags);

	}



	if (flags & SYNC_FSDATA) {

		error = xfs_sync_fsdata(mp, flags);

fs/xfs/linux-2.6/xfs_sync.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ typedef struct bhv_vfs_sync_work { 
 * to disk (this is the main difference between a sync and a quiesce).

 */

#define SYNC_DATA_QUIESCE	(SYNC_DELWRI|SYNC_FSDATA|SYNC_WAIT|SYNC_IOWAIT)

#define SYNC_INODE_QUIESCE	(SYNC_REMOUNT|SYNC_ATTR|SYNC_WAIT)



int xfs_syncd_init(struct xfs_mount *mp);

void xfs_syncd_stop(struct xfs_mount *mp);

fs/xfs/xfs_vfsops.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ xfs_quiesce_fs( 
	 */

	do {

		xfs_log_force(mp, 0, XFS_LOG_FORCE|XFS_LOG_SYNC);

		xfs_sync_inodes(mp, SYNC_INODE_QUIESCE);

		xfs_sync_inodes(mp, SYNC_ATTR|SYNC_WAIT);

		pincount = xfs_flush_buftarg(mp->m_ddev_targp, 1);

		if (!pincount) {

			delay(50);