Commit c97411a3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Zhihao Cheng
Browse files

iomap: rename the flags variable in __iomap_dio_rw 

mainline inclusion
from mainline-v5.12-rc1
commit 5724be5d
category: perf
bugzilla: https://gitee.com/openeuler/kernel/issues/I90ZB5
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5724be5de88f5f6863d44c859f42f70d5cc667ed



--------------------------------

Rename flags to iomap_flags to make the usage a little more clear.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
parent eb4b9cde

fs/iomap/direct-io.c

+4 −4
Original line number Diff line number Diff line
@@ -446,7 +446,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;
@@ -483,7 +483,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 */
@@ -505,7 +505,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);
@@ -536,7 +536,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 */