diff options
| author | Dave Chinner <david@fromorbit.com> | 2009-10-06 20:29:27 +0000 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-10-08 12:00:36 -0500 |
| commit | c90b07e8dd9f263d2e2af1d9648ba269f4d0d8fd (patch) | |
| tree | a2dd23b15d74f1ea338394c545ae5d569a1fb557 /fs | |
| parent | f9581b1443abac50c90168301d40a7734b13a5dc (diff) | |
| download | linux-stable-c90b07e8dd9f263d2e2af1d9648ba269f4d0d8fd.tar.gz linux-stable-c90b07e8dd9f263d2e2af1d9648ba269f4d0d8fd.tar.bz2 linux-stable-c90b07e8dd9f263d2e2af1d9648ba269f4d0d8fd.zip | |
xfs: fix xfs_quiesce_data
We need to do a synchronous xfs_sync_fsdata to make sure the superblock
actually is on disk when we return.
Also remove SYNC_BDFLUSH flag to xfs_sync_inodes because that particular
flag is never checked.
Move xfs_filestream_flush call later to only release inodes after they
have been written out.
Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Alex Elder <aelder@sgi.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_sync.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c index 320be6aea492..7647b8db3ca3 100644 --- a/fs/xfs/linux-2.6/xfs_sync.c +++ b/fs/xfs/linux-2.6/xfs_sync.c @@ -419,14 +419,16 @@ xfs_quiesce_data( /* push non-blocking */ xfs_sync_data(mp, 0); xfs_qm_sync(mp, SYNC_TRYLOCK); - xfs_filestream_flush(mp); - /* push and block */ + /* push and block till complete */ xfs_sync_data(mp, SYNC_WAIT); xfs_qm_sync(mp, SYNC_WAIT); + /* drop inode references pinned by filestreams */ + xfs_filestream_flush(mp); + /* write superblock and hoover up shutdown errors */ - error = xfs_sync_fsdata(mp, 0); + error = xfs_sync_fsdata(mp, SYNC_WAIT); /* flush data-only devices */ if (mp->m_rtdev_targp) |