On Mon, Jan 18, 2021 at 08:35:13PM +0100, Christoph Hellwig wrote:
> Rename flags to iomap_flags to make the usage a little more clear.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Pretty straightforward...
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> fs/iomap/direct-io.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
> index 933f234d5becd0..604103ab76f9c5 100644
> --- a/fs/iomap/direct-io.c
> +++ b/fs/iomap/direct-io.c
> @@ -427,7 +427,7 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
> size_t count = iov_iter_count(iter);
> loff_t pos = iocb->ki_pos;
> loff_t end = iocb->ki_pos + count - 1, ret = 0;
> - unsigned int flags = IOMAP_DIRECT;
> + unsigned int iomap_flags = IOMAP_DIRECT;
> struct blk_plug plug;
> struct iomap_dio *dio;
>
> @@ -461,7 +461,7 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
> if (iter_is_iovec(iter))
> dio->flags |= IOMAP_DIO_DIRTY;
> } else {
> - flags |= IOMAP_WRITE;
> + iomap_flags |= IOMAP_WRITE;
> dio->flags |= IOMAP_DIO_WRITE;
>
> /* for data sync or sync, we need sync completion processing */
> @@ -483,7 +483,7 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
> ret = -EAGAIN;
> goto out_free_dio;
> }
> - flags |= IOMAP_NOWAIT;
> + iomap_flags |= IOMAP_NOWAIT;
> }
>
> ret = filemap_write_and_wait_range(mapping, pos, end);
> @@ -514,7 +514,7 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
>
> blk_start_plug(&plug);
> do {
> - ret = iomap_apply(inode, pos, count, flags, ops, dio,
> + ret = iomap_apply(inode, pos, count, iomap_flags, ops, dio,
> iomap_dio_actor);
> if (ret <= 0) {
> /* magic error code to fall back to buffered I/O */
> --
> 2.29.2
>
