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

Commit b0710ccc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files

xfs: remove SYNC_IOWAIT 



We want to wait for all I/O to finish when we do data integrity syncs.  So
there is no reason to keep SYNC_WAIT separate from SYNC_IOWAIT.  This
causes a little change in behaviour for the ENOSPC flushing code which now
does a second submission and wait of buffered I/O, but that should finish
ASAP as we already did an asynchronous writeout earlier.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed-by: default avatarEric Sandeen <sandeen@sandeen.net>
parent 075fe102

fs/xfs/linux-2.6/xfs_sync.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -227,7 +227,7 @@ xfs_sync_inode_data( 
	xfs_iunlock(ip, XFS_IOLOCK_SHARED);

	xfs_iunlock(ip, XFS_IOLOCK_SHARED);





 out_wait:

 out_wait:

	if (flags & SYNC_IOWAIT)

	if (flags & SYNC_WAIT)

		xfs_ioend_wait(ip);

		xfs_ioend_wait(ip);

	IRELE(ip);

	IRELE(ip);

	return error;

	return error;
@@ -278,7 +278,7 @@ xfs_sync_data( 
{

{

	int			error;

	int			error;





	ASSERT((flags & ~(SYNC_TRYLOCK|SYNC_WAIT|SYNC_IOWAIT)) == 0);

	ASSERT((flags & ~(SYNC_TRYLOCK|SYNC_WAIT)) == 0);





	error = xfs_inode_ag_iterator(mp, xfs_sync_inode_data, flags,

	error = xfs_inode_ag_iterator(mp, xfs_sync_inode_data, flags,

				      XFS_ICI_NO_TAG);

				      XFS_ICI_NO_TAG);
@@ -422,7 +422,7 @@ xfs_quiesce_data( 
	xfs_filestream_flush(mp);

	xfs_filestream_flush(mp);





	/* push and block */

	/* push and block */

	xfs_sync_data(mp, SYNC_WAIT|SYNC_IOWAIT);

	xfs_sync_data(mp, SYNC_WAIT);

	xfs_qm_sync(mp, SYNC_WAIT);

	xfs_qm_sync(mp, SYNC_WAIT);





	/* write superblock and hoover up shutdown errors */

	/* write superblock and hoover up shutdown errors */
@@ -535,7 +535,7 @@ xfs_flush_inodes_work( 
{

{

	struct inode	*inode = arg;

	struct inode	*inode = arg;

	xfs_sync_data(mp, SYNC_TRYLOCK);

	xfs_sync_data(mp, SYNC_TRYLOCK);

	xfs_sync_data(mp, SYNC_TRYLOCK | SYNC_IOWAIT);

	xfs_sync_data(mp, SYNC_TRYLOCK | SYNC_WAIT);

	iput(inode);

	iput(inode);

}

}

fs/xfs/linux-2.6/xfs_sync.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ typedef struct xfs_sync_work { 




#define SYNC_WAIT		0x0004	/* wait for i/o to complete */

#define SYNC_WAIT		0x0004	/* wait for i/o to complete */

#define SYNC_BDFLUSH		0x0008	/* BDFLUSH is calling -- don't block */

#define SYNC_BDFLUSH		0x0008	/* BDFLUSH is calling -- don't block */

#define SYNC_IOWAIT		0x0010  /* wait for all I/O to complete */

#define SYNC_TRYLOCK		0x0020  /* only try to lock inodes */

#define SYNC_TRYLOCK		0x0020  /* only try to lock inodes */





int xfs_syncd_init(struct xfs_mount *mp);

int xfs_syncd_init(struct xfs_mount *mp);