iomap: rename the flags variable in __iomap_dio_rw
authorChristoph Hellwig <hch@lst.de>
Sat, 23 Jan 2021 18:06:09 +0000 (10:06 -0800)
committerDarrick J. Wong <djwong@kernel.org>
Sat, 23 Jan 2021 18:06:09 +0000 (10:06 -0800)
Rename flags to iomap_flags to make the usage a little more clear.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
fs/iomap/direct-io.c

index 933f234..604103a 100644 (file)
@@ -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 */