diff options
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_sync.c | 8 | ||||
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_sync.h | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c index c1a9a1135073..32abd96b1095 100644 --- a/fs/xfs/linux-2.6/xfs_sync.c +++ b/fs/xfs/linux-2.6/xfs_sync.c @@ -227,7 +227,7 @@ xfs_sync_inode_data( xfs_iunlock(ip, XFS_IOLOCK_SHARED); out_wait: - if (flags & SYNC_IOWAIT) + if (flags & SYNC_WAIT) xfs_ioend_wait(ip); IRELE(ip); return error; @@ -278,7 +278,7 @@ xfs_sync_data( { 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, XFS_ICI_NO_TAG); @@ -422,7 +422,7 @@ xfs_quiesce_data( xfs_filestream_flush(mp); /* push and block */ - xfs_sync_data(mp, SYNC_WAIT|SYNC_IOWAIT); + xfs_sync_data(mp, SYNC_WAIT); xfs_qm_sync(mp, SYNC_WAIT); /* write superblock and hoover up shutdown errors */ @@ -535,7 +535,7 @@ xfs_flush_inodes_work( { struct inode *inode = arg; xfs_sync_data(mp, SYNC_TRYLOCK); - xfs_sync_data(mp, SYNC_TRYLOCK | SYNC_IOWAIT); + xfs_sync_data(mp, SYNC_TRYLOCK | SYNC_WAIT); iput(inode); } diff --git a/fs/xfs/linux-2.6/xfs_sync.h b/fs/xfs/linux-2.6/xfs_sync.h index 26bfb5c42e76..bda33a03e12b 100644 --- a/fs/xfs/linux-2.6/xfs_sync.h +++ b/fs/xfs/linux-2.6/xfs_sync.h @@ -31,7 +31,6 @@ typedef struct xfs_sync_work { #define SYNC_WAIT 0x0004 /* wait for i/o to complete */ #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 */ int xfs_syncd_init(struct xfs_mount *mp); |