diff options
| author | Dave Chinner <dchinner@redhat.com> | 2012-11-12 12:53:56 +0100 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2012-11-14 22:12:45 +0100 |
| commit | 4bc1ea6b8ddd4f2bd78944fbe5a1042ac14b1f5f (patch) | |
| tree | 8fb1419d5f7329afb431dbed481d441eb9d38c0c /fs/xfs/xfs_bmap.c | |
| parent | xfs: remove xfs_wait_on_pages() (diff) | |
| download | linux-4bc1ea6b8ddd4f2bd78944fbe5a1042ac14b1f5f.tar.xz linux-4bc1ea6b8ddd4f2bd78944fbe5a1042ac14b1f5f.zip | |
xfs: remove xfs_flush_pages
It is a complex wrapper around VFS functions, but there are VFS
functions that provide exactly the same functionality. Call the VFS
functions directly and remove the unnecessary indirection and
complexity.
We don't need to care about clearing the XFS_ITRUNCATED flag, as
that is done during .writepages. Hence is cleared by the VFS
writeback path if there is anything to write back during the flush.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Andrew Dahl <adahl@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_bmap.c')
| -rw-r--r-- | fs/xfs/xfs_bmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index 83d0cf3df930..a60f3d1f151c 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c @@ -5599,7 +5599,7 @@ xfs_getbmap( xfs_ilock(ip, XFS_IOLOCK_SHARED); if (whichfork == XFS_DATA_FORK && !(iflags & BMV_IF_DELALLOC)) { if (ip->i_delayed_blks || XFS_ISIZE(ip) > ip->i_d.di_size) { - error = xfs_flush_pages(ip, 0, -1, 0, FI_REMAPF); + error = -filemap_write_and_wait(VFS_I(ip)->i_mapping); if (error) goto out_unlock_iolock; } |