diff mbox series

[focal:linux-bluefield,1/1] UBUNTU: SAUCE: Revert "block: don't ignore REQ_NOWAIT for direct IO"

Message ID 20211006110643.3359608-2-jesse.sung@canonical.com
State New
Headers show
Series UBUNTU: SAUCE: Revert "block: don't ignore REQ_NOWAIT for direct IO" | expand

Commit Message

Wen-chien Jesse Sung Oct. 6, 2021, 11:06 a.m. UTC 
BugLink: https://launchpad.net/bugs/1946219

This reverts commit d6757b3e34831b7615edd3268b878536761f8b2e.

After configuration multipath with io uring virtio_blk module is stuck
with that commit applied. Revert it for now.

Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
---
 fs/block_dev.c | 4 ----
 1 file changed, 4 deletions(-)
diff mbox series

Patch

diff --git a/fs/block_dev.c b/fs/block_dev.c
index fa329c7eddf02..2ab29da9b4bc3 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -246,8 +246,6 @@  __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,
 		bio.bi_opf = dio_bio_write_op(iocb);
 		task_io_account_write(ret);
 	}
-	if (iocb->ki_flags & IOCB_NOWAIT)
-		bio.bi_opf |= REQ_NOWAIT;
 	if (iocb->ki_flags & IOCB_HIPRI)
 		bio_set_polled(&bio, iocb);
 
@@ -401,8 +399,6 @@  __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
 			bio->bi_opf = dio_bio_write_op(iocb);
 			task_io_account_write(bio->bi_iter.bi_size);
 		}
-		if (iocb->ki_flags & IOCB_NOWAIT)
-			bio->bi_opf |= REQ_NOWAIT;
 
 		dio->size += bio->bi_iter.bi_size;
 		pos += bio->bi_iter.bi_size;