New code for 5.4:
- Report both io errors and short io results to the directio endio handler. - Allow directio callers to pass an ops structure to iomap_dio_rw. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEUzaAxoMeQq6m2jMV+H93GTRKtOsFAl2EQBwACgkQ+H93GTRK tOvZ0w//R00Dya3pZmO+HQX/Kovo/AOKCct/gPaLvRf4DVvWZ3ZH5lPtDUSKCHBV Pw+potTuabwtp//mZrQ84ZMoQYOmxBmxchquJ2L49qWT/mZ1BDqBA2sxQOCehffO Dlv715eOPVhkVHOEAHv+BsatxlFDkuKgGcwUqxE4LNHWGrvmjm6rBWPCnxQMTwX9 BhGo/0WG6D0leWFSMoUIpcD4Oj302/O43RX4lJsyl0Jd5pKJD/RFtaKqwIeE+pj9 36MnoQYtT5e9BTm1/zzHRVpGgLDDWTY+IClgZNlZprU/Em+TtOGMWitWzob3wWcU QHj5bJ9NiWBT6QJ192i0+I0thSTwW/peOAJrkBOW3YhBkH3UIKSzaPiwCBoSEUKS fuIOJkRHFW7HTjKSw6wUCJJ6ShD+rNPOoaJ9Ivzz7x2HGEqb1al3EIumu6oDJgyq BdnLEecN/JSxPnakpSGAnvlCjZiYbJ95E0JfapzMy7HYpMXfbzZZ4JO9Ld0hQflR sMrGwL82tqE9ish1yRr+2nNEY5PqVJqV0XXU3dZz3HVknNuAvqrqXDXgIZT142zS s9vGAW+2XphyUKHH9pImQKw142n2xiZK+Pd2AuiO4I06E0EkAvN/n9CN7oJ4Cr4F z9rQKNXNx8OSjFtryYe6+IzQ0qQtl2OP7o88K91jYArKP17D8ds= =zkFp -----END PGP SIGNATURE----- Merge tag 'iomap-5.4-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux Pull iomap updates from Darrick Wong: "After last week's failed pull request attempt, I scuttled everything in the branch except for the directio endio api changes, which were trivial. Everything else will simply have to wait for the next cycle. Summary: - Report both io errors and short io results to the directio endio handler. - Allow directio callers to pass an ops structure to iomap_dio_rw" * tag 'iomap-5.4-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: iomap: move the iomap_dio_rw ->end_io callback into a structure iomap: split size and error for iomap_dio_rw ->end_io
This commit is contained in:
commit
4ef5b13a29
|
@ -24,7 +24,7 @@
|
|||
|
||||
struct iomap_dio {
|
||||
struct kiocb *iocb;
|
||||
iomap_dio_end_io_t *end_io;
|
||||
const struct iomap_dio_ops *dops;
|
||||
loff_t i_size;
|
||||
loff_t size;
|
||||
atomic_t ref;
|
||||
|
@ -72,18 +72,14 @@ static void iomap_dio_submit_bio(struct iomap_dio *dio, struct iomap *iomap,
|
|||
|
||||
static ssize_t iomap_dio_complete(struct iomap_dio *dio)
|
||||
{
|
||||
const struct iomap_dio_ops *dops = dio->dops;
|
||||
struct kiocb *iocb = dio->iocb;
|
||||
struct inode *inode = file_inode(iocb->ki_filp);
|
||||
loff_t offset = iocb->ki_pos;
|
||||
ssize_t ret;
|
||||
ssize_t ret = dio->error;
|
||||
|
||||
if (dio->end_io) {
|
||||
ret = dio->end_io(iocb,
|
||||
dio->error ? dio->error : dio->size,
|
||||
dio->flags);
|
||||
} else {
|
||||
ret = dio->error;
|
||||
}
|
||||
if (dops && dops->end_io)
|
||||
ret = dops->end_io(iocb, dio->size, ret, dio->flags);
|
||||
|
||||
if (likely(!ret)) {
|
||||
ret = dio->size;
|
||||
|
@ -101,9 +97,9 @@ static ssize_t iomap_dio_complete(struct iomap_dio *dio)
|
|||
* one is a pretty crazy thing to do, so we don't support it 100%. If
|
||||
* this invalidation fails, tough, the write still worked...
|
||||
*
|
||||
* And this page cache invalidation has to be after dio->end_io(), as
|
||||
* some filesystems convert unwritten extents to real allocations in
|
||||
* end_io() when necessary, otherwise a racing buffer read would cache
|
||||
* And this page cache invalidation has to be after ->end_io(), as some
|
||||
* filesystems convert unwritten extents to real allocations in
|
||||
* ->end_io() when necessary, otherwise a racing buffer read would cache
|
||||
* zeros from unwritten extents.
|
||||
*/
|
||||
if (!dio->error &&
|
||||
|
@ -396,7 +392,7 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length,
|
|||
*/
|
||||
ssize_t
|
||||
iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
|
||||
const struct iomap_ops *ops, iomap_dio_end_io_t end_io)
|
||||
const struct iomap_ops *ops, const struct iomap_dio_ops *dops)
|
||||
{
|
||||
struct address_space *mapping = iocb->ki_filp->f_mapping;
|
||||
struct inode *inode = file_inode(iocb->ki_filp);
|
||||
|
@ -421,7 +417,7 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
|
|||
atomic_set(&dio->ref, 1);
|
||||
dio->size = 0;
|
||||
dio->i_size = i_size_read(inode);
|
||||
dio->end_io = end_io;
|
||||
dio->dops = dops;
|
||||
dio->error = 0;
|
||||
dio->flags = 0;
|
||||
|
||||
|
|
|
@ -370,21 +370,23 @@ static int
|
|||
xfs_dio_write_end_io(
|
||||
struct kiocb *iocb,
|
||||
ssize_t size,
|
||||
int error,
|
||||
unsigned flags)
|
||||
{
|
||||
struct inode *inode = file_inode(iocb->ki_filp);
|
||||
struct xfs_inode *ip = XFS_I(inode);
|
||||
loff_t offset = iocb->ki_pos;
|
||||
unsigned int nofs_flag;
|
||||
int error = 0;
|
||||
|
||||
trace_xfs_end_io_direct_write(ip, offset, size);
|
||||
|
||||
if (XFS_FORCED_SHUTDOWN(ip->i_mount))
|
||||
return -EIO;
|
||||
|
||||
if (size <= 0)
|
||||
return size;
|
||||
if (error)
|
||||
return error;
|
||||
if (!size)
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* Capture amount written on completion as we can't reliably account
|
||||
|
@ -441,6 +443,10 @@ xfs_dio_write_end_io(
|
|||
return error;
|
||||
}
|
||||
|
||||
static const struct iomap_dio_ops xfs_dio_write_ops = {
|
||||
.end_io = xfs_dio_write_end_io,
|
||||
};
|
||||
|
||||
/*
|
||||
* xfs_file_dio_aio_write - handle direct IO writes
|
||||
*
|
||||
|
@ -541,7 +547,7 @@ xfs_file_dio_aio_write(
|
|||
}
|
||||
|
||||
trace_xfs_file_direct_write(ip, count, iocb->ki_pos);
|
||||
ret = iomap_dio_rw(iocb, from, &xfs_iomap_ops, xfs_dio_write_end_io);
|
||||
ret = iomap_dio_rw(iocb, from, &xfs_iomap_ops, &xfs_dio_write_ops);
|
||||
|
||||
/*
|
||||
* If unaligned, this is the only IO in-flight. If it has not yet
|
||||
|
|
|
@ -188,10 +188,14 @@ sector_t iomap_bmap(struct address_space *mapping, sector_t bno,
|
|||
*/
|
||||
#define IOMAP_DIO_UNWRITTEN (1 << 0) /* covers unwritten extent(s) */
|
||||
#define IOMAP_DIO_COW (1 << 1) /* covers COW extent(s) */
|
||||
typedef int (iomap_dio_end_io_t)(struct kiocb *iocb, ssize_t ret,
|
||||
unsigned flags);
|
||||
|
||||
struct iomap_dio_ops {
|
||||
int (*end_io)(struct kiocb *iocb, ssize_t size, int error,
|
||||
unsigned flags);
|
||||
};
|
||||
|
||||
ssize_t iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
|
||||
const struct iomap_ops *ops, iomap_dio_end_io_t end_io);
|
||||
const struct iomap_ops *ops, const struct iomap_dio_ops *dops);
|
||||
int iomap_dio_iopoll(struct kiocb *kiocb, bool spin);
|
||||
|
||||
#ifdef CONFIG_SWAP
|
||||
|
|
Loading…
Reference in New Issue