public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: Christoph Hellwig <hch@infradead.org>
Cc: Jan Kara <jack@suse.cz>, xfs@oss.sgi.com
Subject: [PATCH 1/2] xfs: Replace async callers of xfs_flush_pages()
Date: Thu,  4 Aug 2011 16:13:55 +0200	[thread overview]
Message-ID: <1312467236-31341-2-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1312467236-31341-1-git-send-email-jack@suse.cz>

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@suse.cz>
---
 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

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  reply	other threads:[~2011-08-04 14:14 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-04 14:13 [PATCH 0/2] Removal of xfs_flush_pages() Jan Kara
2011-08-04 14:13 ` Jan Kara [this message]
2011-08-04 14:13 ` [PATCH 2/2] xfs: Remove xfs_flush_pages() helper Jan Kara
2011-08-13 20:45 ` [PATCH 0/2] Removal of xfs_flush_pages() Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1312467236-31341-2-git-send-email-jack@suse.cz \
    --to=jack@suse.cz \
    --cc=hch@infradead.org \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox