xfs
[Top] [All Lists]

[PATCH 1/2] xfs: Replace async callers of xfs_flush_pages()

To: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Subject: [PATCH 1/2] xfs: Replace async callers of xfs_flush_pages()
From: Jan Kara <jack@xxxxxxx>
Date: Thu, 4 Aug 2011 16:13:55 +0200
Cc: xfs@xxxxxxxxxxx, Jan Kara <jack@xxxxxxx>
In-reply-to: <1312467236-31341-1-git-send-email-jack@xxxxxxx>
References: <1312467236-31341-1-git-send-email-jack@xxxxxxx>
There are three places calling xfs_flush_pages() with XBF_ASYNC flag.  Two of
them - xfs_release() and xfs_sync_inode_data() - want just to start writeback
of all inode pages thus change them to use filemap_flush() so that they don't
unnecessarily use WB_SYNC_ALL writeback. The third place in xfs_setattr_size()
is starting a synchronous writeback in fact so keep using
filemap_fdatawrite_range() there.  This way we can also get rid of abusing
XBF_ASYNC flag.

Signed-off-by: Jan Kara <jack@xxxxxxx>
---
 fs/xfs/linux-2.6/xfs_fs_subr.c |    2 --
 fs/xfs/linux-2.6/xfs_iops.c    |    4 ++--
 fs/xfs/linux-2.6/xfs_sync.c    |    7 +++++--
 fs/xfs/xfs_vnodeops.c          |    2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/fs/xfs/linux-2.6/xfs_fs_subr.c b/fs/xfs/linux-2.6/xfs_fs_subr.c
index ed88ed1..4888b78 100644
--- a/fs/xfs/linux-2.6/xfs_fs_subr.c
+++ b/fs/xfs/linux-2.6/xfs_fs_subr.c
@@ -72,8 +72,6 @@ xfs_flush_pages(
        xfs_iflags_clear(ip, XFS_ITRUNCATED);
        ret = -filemap_fdatawrite_range(mapping, first,
                                last == -1 ? LLONG_MAX : last);
-       if (flags & XBF_ASYNC)
-               return ret;
        ret2 = xfs_wait_on_pages(ip, first, last);
        if (!ret)
                ret = ret2;
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index b9c172b..ea935fc 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -825,8 +825,8 @@ xfs_setattr_size(
         * care about here.
         */
        if (ip->i_size != ip->i_d.di_size && iattr->ia_size > ip->i_d.di_size) {
-               error = xfs_flush_pages(ip, ip->i_d.di_size, iattr->ia_size,
-                                       XBF_ASYNC, FI_NONE);
+               error = -filemap_fdatawrite_range(inode->i_mapping,
+                                       ip->i_d.di_size, iattr->ia_size);
                if (error)
                        goto out_unlock;
        }
diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c
index e4c938a..cce4d58 100644
--- a/fs/xfs/linux-2.6/xfs_sync.c
+++ b/fs/xfs/linux-2.6/xfs_sync.c
@@ -235,8 +235,11 @@ xfs_sync_inode_data(
                xfs_ilock(ip, XFS_IOLOCK_SHARED);
        }
 
-       error = xfs_flush_pages(ip, 0, -1, (flags & SYNC_WAIT) ?
-                               0 : XBF_ASYNC, FI_NONE);
+       xfs_iflags_clear(ip, XFS_ITRUNCATED);
+       if (flags & SYNC_WAIT)
+               error = xfs_flush_pages(ip, 0, -1, 0, FI_NONE);
+       else
+               error = -filemap_flush(mapping);
        xfs_iunlock(ip, XFS_IOLOCK_SHARED);
 
  out_wait:
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 9322e13..71d066c 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -522,7 +522,7 @@ xfs_release(
                if (truncated) {
                        xfs_iflags_clear(ip, XFS_IDIRTY_RELEASE);
                        if (VN_DIRTY(VFS_I(ip)) && ip->i_delayed_blks > 0)
-                               xfs_flush_pages(ip, 0, -1, XBF_ASYNC, FI_NONE);
+                               filemap_flush(VFS_I(ip)->i_mapping);
                }
        }
 
-- 
1.7.1

<Prev in Thread] Current Thread [Next in Thread>