| Message ID | 1519386329-2734-1-git-send-email-nborisov@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Looks fine,
Reviewed-by: Christoph Hellwig <hch@lst.de>
On 23.02.2018 13:45, Nikolay Borisov wrote: > This flag was added by 6039257378e4 ("direct-io: add flag to allow aio > writes beyond i_size") to support XFS. However, with the rework of > XFS' DIO's path to use iomap in acdda3aae146 ("xfs: use iomap_dio_rw") > it became redundant. So let's remove it. > > Signed-off-by: Nikolay Borisov <nborisov@suse.com> Jens, On a second look I think you are the more appropriate person to take these patches. SO do you have any objections to merging those via the block tree. ( I did CC you but didn't cc linux-block). > --- > fs/direct-io.c | 3 +-- > include/linux/fs.h | 3 --- > 2 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/fs/direct-io.c b/fs/direct-io.c > index a0ca9e48e993..99a81c49bce9 100644 > --- a/fs/direct-io.c > +++ b/fs/direct-io.c > @@ -1252,8 +1252,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, > */ > if (is_sync_kiocb(iocb)) > dio->is_async = false; > - else if (!(dio->flags & DIO_ASYNC_EXTEND) && > - iov_iter_rw(iter) == WRITE && end > i_size_read(inode)) > + else if (iov_iter_rw(iter) == WRITE && end > i_size_read(inode)) > dio->is_async = false; > else > dio->is_async = true; > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 2a815560fda0..260c233e7375 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -2977,9 +2977,6 @@ enum { > /* filesystem does not support filling holes */ > DIO_SKIP_HOLES = 0x02, > > - /* filesystem can handle aio writes beyond i_size */ > - DIO_ASYNC_EXTEND = 0x04, > - > /* inode/fs/bdev does not need truncate protection */ > DIO_SKIP_DIO_COUNT = 0x08, > }; >
On 3/12/18 2:54 AM, Nikolay Borisov wrote: > > > On 23.02.2018 13:45, Nikolay Borisov wrote: >> This flag was added by 6039257378e4 ("direct-io: add flag to allow aio >> writes beyond i_size") to support XFS. However, with the rework of >> XFS' DIO's path to use iomap in acdda3aae146 ("xfs: use iomap_dio_rw") >> it became redundant. So let's remove it. >> >> Signed-off-by: Nikolay Borisov <nborisov@suse.com> > > Jens, > > On a second look I think you are the more appropriate person to take > these patches. SO do you have any objections to merging those via the > block tree. ( I did CC you but didn't cc linux-block). Both look fine to me, I can add them for 4.17. Thanks.
diff --git a/fs/direct-io.c b/fs/direct-io.c index a0ca9e48e993..99a81c49bce9 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -1252,8 +1252,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, */ if (is_sync_kiocb(iocb)) dio->is_async = false; - else if (!(dio->flags & DIO_ASYNC_EXTEND) && - iov_iter_rw(iter) == WRITE && end > i_size_read(inode)) + else if (iov_iter_rw(iter) == WRITE && end > i_size_read(inode)) dio->is_async = false; else dio->is_async = true; diff --git a/include/linux/fs.h b/include/linux/fs.h index 2a815560fda0..260c233e7375 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2977,9 +2977,6 @@ enum { /* filesystem does not support filling holes */ DIO_SKIP_HOLES = 0x02, - /* filesystem can handle aio writes beyond i_size */ - DIO_ASYNC_EXTEND = 0x04, - /* inode/fs/bdev does not need truncate protection */ DIO_SKIP_DIO_COUNT = 0x08, };
This flag was added by 6039257378e4 ("direct-io: add flag to allow aio writes beyond i_size") to support XFS. However, with the rework of XFS' DIO's path to use iomap in acdda3aae146 ("xfs: use iomap_dio_rw") it became redundant. So let's remove it. Signed-off-by: Nikolay Borisov <nborisov@suse.com> --- fs/direct-io.c | 3 +-- include/linux/fs.h | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-)