From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: axboe@kernel.dk, tytso@mit.edu, david@fromorbit.com,
jmoyer@redhat.com, bpm@sgi.com, viro@zeniv.linux.org.uk,
jack@suse.cz
Cc: linux-fsdevel@vger.kernel.org, hch@infradead.org,
linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org,
xfs@oss.sgi.com
Subject: [PATCH 3/9] xfs: factor out everything but the filemap_write_and_wait from xfs_file_fsync
Date: Mon, 19 Nov 2012 23:41:38 -0800 [thread overview]
Message-ID: <20121120074138.24645.36708.stgit@blackbox.djwong.org> (raw)
In-Reply-To: <20121120074116.24645.36369.stgit@blackbox.djwong.org>
Hi,
Fsyncing is tricky business, so factor out the bits of the xfs_file_fsync
function that can be used from the I/O post-processing path.
From: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
---
fs/xfs/xfs_file.c | 44 +++++++++++++++++++++++++++++---------------
fs/xfs/xfs_inode.h | 1 +
2 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index aa473fa..507f446 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -152,25 +152,18 @@ xfs_dir_fsync(
return _xfs_log_force_lsn(mp, lsn, XFS_LOG_SYNC, NULL);
}
-STATIC int
-xfs_file_fsync(
- struct file *file,
- loff_t start,
- loff_t end,
+/*
+ * Returns 0 on success, -errno on failure.
+ */
+int
+do_xfs_file_fsync(
+ struct xfs_inode *ip,
+ struct xfs_mount *mp,
int datasync)
{
- struct inode *inode = file->f_mapping->host;
- struct xfs_inode *ip = XFS_I(inode);
- struct xfs_mount *mp = ip->i_mount;
- int error = 0;
int log_flushed = 0;
xfs_lsn_t lsn = 0;
-
- trace_xfs_file_fsync(ip);
-
- error = filemap_write_and_wait_range(inode->i_mapping, start, end);
- if (error)
- return error;
+ int error = 0;
if (XFS_FORCED_SHUTDOWN(mp))
return -XFS_ERROR(EIO);
@@ -222,6 +215,27 @@ xfs_file_fsync(
return -error;
}
+STATIC int
+xfs_file_fsync(
+ struct file *file,
+ loff_t start,
+ loff_t end,
+ int datasync)
+{
+ struct inode *inode = file->f_mapping->host;
+ struct xfs_inode *ip = XFS_I(inode);
+ struct xfs_mount *mp = ip->i_mount;
+ int error = 0;
+
+ trace_xfs_file_fsync(ip);
+
+ error = filemap_write_and_wait_range(inode->i_mapping, start, end);
+ if (error)
+ return error;
+
+ return do_xfs_file_fsync(ip, mp, datasync);
+}
+
STATIC ssize_t
xfs_file_aio_read(
struct kiocb *iocb,
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 94b32f9..d5bf105 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -546,6 +546,7 @@ do { \
iput(VFS_I(ip)); \
} while (0)
+int do_xfs_file_fsync(struct xfs_inode *, struct xfs_mount *, int);
#endif /* __KERNEL__ */
/*
next prev parent reply other threads:[~2012-11-20 7:41 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-20 7:41 [PATCH v1 0/9] fs: fix up AIO+DIO+O_SYNC to actually do the sync part Darrick J. Wong
2012-11-20 7:41 ` [PATCH 1/9] vfs: Handle O_SYNC AIO DIO in generic code properly Darrick J. Wong
2012-11-21 10:08 ` Christoph Hellwig
2012-11-21 16:58 ` Jeff Moyer
2012-11-21 18:29 ` Christoph Hellwig
2012-11-21 18:38 ` Jeff Moyer
2012-11-21 21:37 ` Jan Kara
2012-11-21 23:09 ` Jeffrey Ellis
2012-11-20 7:41 ` [PATCH 2/9] ext4: honor the O_SYNC flag for aysnchronous direct I/O requests Darrick J. Wong
2012-11-20 10:07 ` Jan Kara
2012-11-20 20:02 ` Jeff Moyer
2012-11-21 0:56 ` Jan Kara
2012-11-21 14:09 ` Jeff Moyer
2012-11-21 16:54 ` Jan Kara
2012-11-20 7:41 ` Darrick J. Wong [this message]
2012-11-20 10:47 ` [PATCH 3/9] xfs: factor out everything but the filemap_write_and_wait from xfs_file_fsync Dave Chinner
2012-11-21 10:09 ` Christoph Hellwig
2012-11-21 14:10 ` Jeff Moyer
2012-11-20 7:51 ` [PATCH 7/9] ocfs2: Use generic handlers of O_SYNC AIO DIO Darrick J. Wong
2012-11-21 19:32 ` Joel Becker
2012-11-20 7:51 ` [PATCH 5/9] btrfs: " Darrick J. Wong
2012-11-20 7:51 ` [PATCH 6/9] gfs2: " Darrick J. Wong
2012-11-20 7:51 ` [PATCH 4/9] xfs: honor the O_SYNC flag for aysnchronous direct I/O requests Darrick J. Wong
2012-11-20 10:24 ` Jan Kara
2012-11-20 11:20 ` Dave Chinner
2012-11-20 19:42 ` Jeff Moyer
2012-11-20 20:08 ` Dave Chinner
2012-11-20 7:51 ` [PATCH 8/9] filemap: don't call generic_write_sync for -EIOCBQUEUED Darrick J. Wong
2012-11-20 7:51 ` [PATCH 9/9] blkdev: Fix up AIO+DIO+O_SYNC to do the sync part correctly Darrick J. Wong
2012-11-20 10:15 ` Jan Kara
2012-11-20 20:47 ` Jeff Moyer
2012-11-21 0:57 ` Jan Kara
2012-11-20 8:38 ` [PATCH v1 0/9] fs: fix up AIO+DIO+O_SYNC to actually do the sync part Darrick J. Wong
2012-11-20 14:23 ` Jeff Moyer
2012-11-20 18:57 ` Darrick J. Wong
2012-11-20 19:05 ` Jeff Moyer
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=20121120074138.24645.36708.stgit@blackbox.djwong.org \
--to=darrick.wong@oracle.com \
--cc=axboe@kernel.dk \
--cc=bpm@sgi.com \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=jmoyer@redhat.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--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;
as well as URLs for NNTP newsgroup(s).