| Message ID | 20210118193516.2915706-4-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/11] xfs: factor out a xfs_ilock_iocb helper | expand |
On Mon, Jan 18, 2021 at 08:35:08PM +0100, Christoph Hellwig wrote: > Drop a few pointless aio_ prefixes. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Dave Chinner <dchinner@redhat.com> > --- Reviewed-by: Brian Foster <bfoster@redhat.com> > fs/xfs/xfs_file.c | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c > index fb4e6f2852bb8b..ae7313ccaa11ed 100644 > --- a/fs/xfs/xfs_file.c > +++ b/fs/xfs/xfs_file.c > @@ -215,7 +215,7 @@ xfs_ilock_iocb( > } > > STATIC ssize_t > -xfs_file_dio_aio_read( > +xfs_file_dio_read( > struct kiocb *iocb, > struct iov_iter *to) > { > @@ -265,7 +265,7 @@ xfs_file_dax_read( > } > > STATIC ssize_t > -xfs_file_buffered_aio_read( > +xfs_file_buffered_read( > struct kiocb *iocb, > struct iov_iter *to) > { > @@ -300,9 +300,9 @@ xfs_file_read_iter( > if (IS_DAX(inode)) > ret = xfs_file_dax_read(iocb, to); > else if (iocb->ki_flags & IOCB_DIRECT) > - ret = xfs_file_dio_aio_read(iocb, to); > + ret = xfs_file_dio_read(iocb, to); > else > - ret = xfs_file_buffered_aio_read(iocb, to); > + ret = xfs_file_buffered_read(iocb, to); > > if (ret > 0) > XFS_STATS_ADD(mp, xs_read_bytes, ret); > @@ -317,7 +317,7 @@ xfs_file_read_iter( > * if called for a direct write beyond i_size. > */ > STATIC ssize_t > -xfs_file_aio_write_checks( > +xfs_file_write_checks( > struct kiocb *iocb, > struct iov_iter *from, > int *iolock) > @@ -502,7 +502,7 @@ static const struct iomap_dio_ops xfs_dio_write_ops = { > }; > > /* > - * xfs_file_dio_aio_write - handle direct IO writes > + * xfs_file_dio_write - handle direct IO writes > * > * Lock the inode appropriately to prepare for and issue a direct IO write. > * By separating it from the buffered write path we remove all the tricky to > @@ -527,7 +527,7 @@ static const struct iomap_dio_ops xfs_dio_write_ops = { > * negative return values. > */ > STATIC ssize_t > -xfs_file_dio_aio_write( > +xfs_file_dio_write( > struct kiocb *iocb, > struct iov_iter *from) > { > @@ -549,7 +549,7 @@ xfs_file_dio_aio_write( > /* > * Don't take the exclusive iolock here unless the I/O is unaligned to > * the file system block size. We don't need to consider the EOF > - * extension case here because xfs_file_aio_write_checks() will relock > + * extension case here because xfs_file_write_checks() will relock > * the inode as necessary for EOF zeroing cases and fill out the new > * inode size as appropriate. > */ > @@ -580,7 +580,7 @@ xfs_file_dio_aio_write( > xfs_ilock(ip, iolock); > } > > - ret = xfs_file_aio_write_checks(iocb, from, &iolock); > + ret = xfs_file_write_checks(iocb, from, &iolock); > if (ret) > goto out; > count = iov_iter_count(from); > @@ -590,7 +590,7 @@ xfs_file_dio_aio_write( > * in-flight at the same time or we risk data corruption. Wait for all > * other IO to drain before we submit. If the IO is aligned, demote the > * iolock if we had to take the exclusive lock in > - * xfs_file_aio_write_checks() for other reasons. > + * xfs_file_write_checks() for other reasons. > */ > if (unaligned_io) { > inode_dio_wait(inode); > @@ -634,7 +634,7 @@ xfs_file_dax_write( > ret = xfs_ilock_iocb(iocb, iolock); > if (ret) > return ret; > - ret = xfs_file_aio_write_checks(iocb, from, &iolock); > + ret = xfs_file_write_checks(iocb, from, &iolock); > if (ret) > goto out; > > @@ -663,7 +663,7 @@ xfs_file_dax_write( > } > > STATIC ssize_t > -xfs_file_buffered_aio_write( > +xfs_file_buffered_write( > struct kiocb *iocb, > struct iov_iter *from) > { > @@ -682,7 +682,7 @@ xfs_file_buffered_aio_write( > iolock = XFS_IOLOCK_EXCL; > xfs_ilock(ip, iolock); > > - ret = xfs_file_aio_write_checks(iocb, from, &iolock); > + ret = xfs_file_write_checks(iocb, from, &iolock); > if (ret) > goto out; > > @@ -769,12 +769,12 @@ xfs_file_write_iter( > * CoW. In all other directio scenarios we do not > * allow an operation to fall back to buffered mode. > */ > - ret = xfs_file_dio_aio_write(iocb, from); > + ret = xfs_file_dio_write(iocb, from); > if (ret != -ENOTBLK) > return ret; > } > > - return xfs_file_buffered_aio_write(iocb, from); > + return xfs_file_buffered_write(iocb, from); > } > > static void > -- > 2.29.2 >
On Mon, Jan 18, 2021 at 08:35:08PM +0100, Christoph Hellwig wrote: > Drop a few pointless aio_ prefixes. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Dave Chinner <dchinner@redhat.com> Mmmm shortening! Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/xfs/xfs_file.c | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c > index fb4e6f2852bb8b..ae7313ccaa11ed 100644 > --- a/fs/xfs/xfs_file.c > +++ b/fs/xfs/xfs_file.c > @@ -215,7 +215,7 @@ xfs_ilock_iocb( > } > > STATIC ssize_t > -xfs_file_dio_aio_read( > +xfs_file_dio_read( > struct kiocb *iocb, > struct iov_iter *to) > { > @@ -265,7 +265,7 @@ xfs_file_dax_read( > } > > STATIC ssize_t > -xfs_file_buffered_aio_read( > +xfs_file_buffered_read( > struct kiocb *iocb, > struct iov_iter *to) > { > @@ -300,9 +300,9 @@ xfs_file_read_iter( > if (IS_DAX(inode)) > ret = xfs_file_dax_read(iocb, to); > else if (iocb->ki_flags & IOCB_DIRECT) > - ret = xfs_file_dio_aio_read(iocb, to); > + ret = xfs_file_dio_read(iocb, to); > else > - ret = xfs_file_buffered_aio_read(iocb, to); > + ret = xfs_file_buffered_read(iocb, to); > > if (ret > 0) > XFS_STATS_ADD(mp, xs_read_bytes, ret); > @@ -317,7 +317,7 @@ xfs_file_read_iter( > * if called for a direct write beyond i_size. > */ > STATIC ssize_t > -xfs_file_aio_write_checks( > +xfs_file_write_checks( > struct kiocb *iocb, > struct iov_iter *from, > int *iolock) > @@ -502,7 +502,7 @@ static const struct iomap_dio_ops xfs_dio_write_ops = { > }; > > /* > - * xfs_file_dio_aio_write - handle direct IO writes > + * xfs_file_dio_write - handle direct IO writes > * > * Lock the inode appropriately to prepare for and issue a direct IO write. > * By separating it from the buffered write path we remove all the tricky to > @@ -527,7 +527,7 @@ static const struct iomap_dio_ops xfs_dio_write_ops = { > * negative return values. > */ > STATIC ssize_t > -xfs_file_dio_aio_write( > +xfs_file_dio_write( > struct kiocb *iocb, > struct iov_iter *from) > { > @@ -549,7 +549,7 @@ xfs_file_dio_aio_write( > /* > * Don't take the exclusive iolock here unless the I/O is unaligned to > * the file system block size. We don't need to consider the EOF > - * extension case here because xfs_file_aio_write_checks() will relock > + * extension case here because xfs_file_write_checks() will relock > * the inode as necessary for EOF zeroing cases and fill out the new > * inode size as appropriate. > */ > @@ -580,7 +580,7 @@ xfs_file_dio_aio_write( > xfs_ilock(ip, iolock); > } > > - ret = xfs_file_aio_write_checks(iocb, from, &iolock); > + ret = xfs_file_write_checks(iocb, from, &iolock); > if (ret) > goto out; > count = iov_iter_count(from); > @@ -590,7 +590,7 @@ xfs_file_dio_aio_write( > * in-flight at the same time or we risk data corruption. Wait for all > * other IO to drain before we submit. If the IO is aligned, demote the > * iolock if we had to take the exclusive lock in > - * xfs_file_aio_write_checks() for other reasons. > + * xfs_file_write_checks() for other reasons. > */ > if (unaligned_io) { > inode_dio_wait(inode); > @@ -634,7 +634,7 @@ xfs_file_dax_write( > ret = xfs_ilock_iocb(iocb, iolock); > if (ret) > return ret; > - ret = xfs_file_aio_write_checks(iocb, from, &iolock); > + ret = xfs_file_write_checks(iocb, from, &iolock); > if (ret) > goto out; > > @@ -663,7 +663,7 @@ xfs_file_dax_write( > } > > STATIC ssize_t > -xfs_file_buffered_aio_write( > +xfs_file_buffered_write( > struct kiocb *iocb, > struct iov_iter *from) > { > @@ -682,7 +682,7 @@ xfs_file_buffered_aio_write( > iolock = XFS_IOLOCK_EXCL; > xfs_ilock(ip, iolock); > > - ret = xfs_file_aio_write_checks(iocb, from, &iolock); > + ret = xfs_file_write_checks(iocb, from, &iolock); > if (ret) > goto out; > > @@ -769,12 +769,12 @@ xfs_file_write_iter( > * CoW. In all other directio scenarios we do not > * allow an operation to fall back to buffered mode. > */ > - ret = xfs_file_dio_aio_write(iocb, from); > + ret = xfs_file_dio_write(iocb, from); > if (ret != -ENOTBLK) > return ret; > } > > - return xfs_file_buffered_aio_write(iocb, from); > + return xfs_file_buffered_write(iocb, from); > } > > static void > -- > 2.29.2 >
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index fb4e6f2852bb8b..ae7313ccaa11ed 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -215,7 +215,7 @@ xfs_ilock_iocb( } STATIC ssize_t -xfs_file_dio_aio_read( +xfs_file_dio_read( struct kiocb *iocb, struct iov_iter *to) { @@ -265,7 +265,7 @@ xfs_file_dax_read( } STATIC ssize_t -xfs_file_buffered_aio_read( +xfs_file_buffered_read( struct kiocb *iocb, struct iov_iter *to) { @@ -300,9 +300,9 @@ xfs_file_read_iter( if (IS_DAX(inode)) ret = xfs_file_dax_read(iocb, to); else if (iocb->ki_flags & IOCB_DIRECT) - ret = xfs_file_dio_aio_read(iocb, to); + ret = xfs_file_dio_read(iocb, to); else - ret = xfs_file_buffered_aio_read(iocb, to); + ret = xfs_file_buffered_read(iocb, to); if (ret > 0) XFS_STATS_ADD(mp, xs_read_bytes, ret); @@ -317,7 +317,7 @@ xfs_file_read_iter( * if called for a direct write beyond i_size. */ STATIC ssize_t -xfs_file_aio_write_checks( +xfs_file_write_checks( struct kiocb *iocb, struct iov_iter *from, int *iolock) @@ -502,7 +502,7 @@ static const struct iomap_dio_ops xfs_dio_write_ops = { }; /* - * xfs_file_dio_aio_write - handle direct IO writes + * xfs_file_dio_write - handle direct IO writes * * Lock the inode appropriately to prepare for and issue a direct IO write. * By separating it from the buffered write path we remove all the tricky to @@ -527,7 +527,7 @@ static const struct iomap_dio_ops xfs_dio_write_ops = { * negative return values. */ STATIC ssize_t -xfs_file_dio_aio_write( +xfs_file_dio_write( struct kiocb *iocb, struct iov_iter *from) { @@ -549,7 +549,7 @@ xfs_file_dio_aio_write( /* * Don't take the exclusive iolock here unless the I/O is unaligned to * the file system block size. We don't need to consider the EOF - * extension case here because xfs_file_aio_write_checks() will relock + * extension case here because xfs_file_write_checks() will relock * the inode as necessary for EOF zeroing cases and fill out the new * inode size as appropriate. */ @@ -580,7 +580,7 @@ xfs_file_dio_aio_write( xfs_ilock(ip, iolock); } - ret = xfs_file_aio_write_checks(iocb, from, &iolock); + ret = xfs_file_write_checks(iocb, from, &iolock); if (ret) goto out; count = iov_iter_count(from); @@ -590,7 +590,7 @@ xfs_file_dio_aio_write( * in-flight at the same time or we risk data corruption. Wait for all * other IO to drain before we submit. If the IO is aligned, demote the * iolock if we had to take the exclusive lock in - * xfs_file_aio_write_checks() for other reasons. + * xfs_file_write_checks() for other reasons. */ if (unaligned_io) { inode_dio_wait(inode); @@ -634,7 +634,7 @@ xfs_file_dax_write( ret = xfs_ilock_iocb(iocb, iolock); if (ret) return ret; - ret = xfs_file_aio_write_checks(iocb, from, &iolock); + ret = xfs_file_write_checks(iocb, from, &iolock); if (ret) goto out; @@ -663,7 +663,7 @@ xfs_file_dax_write( } STATIC ssize_t -xfs_file_buffered_aio_write( +xfs_file_buffered_write( struct kiocb *iocb, struct iov_iter *from) { @@ -682,7 +682,7 @@ xfs_file_buffered_aio_write( iolock = XFS_IOLOCK_EXCL; xfs_ilock(ip, iolock); - ret = xfs_file_aio_write_checks(iocb, from, &iolock); + ret = xfs_file_write_checks(iocb, from, &iolock); if (ret) goto out; @@ -769,12 +769,12 @@ xfs_file_write_iter( * CoW. In all other directio scenarios we do not * allow an operation to fall back to buffered mode. */ - ret = xfs_file_dio_aio_write(iocb, from); + ret = xfs_file_dio_write(iocb, from); if (ret != -ENOTBLK) return ret; } - return xfs_file_buffered_aio_write(iocb, from); + return xfs_file_buffered_write(iocb, from); } static void