block: move REQ_NOWAIT (8977f563) · Commits · 戴 / test

This flag should be before the operation-specific REQ_NOUNMAP bit. Signed-off-by:

include/linux/blk_types.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -224,11 +224,11 @@ enum req_flag_bits {
		__REQ_PREFLUSH, /* request for cache flush */
		__REQ_RAHEAD, /* read ahead, can fail anytime */
		__REQ_BACKGROUND, /* background IO */
		__REQ_NOWAIT, /* Don't wait if request will block */

		/* command specific flags for REQ_OP_WRITE_ZEROES: */
		__REQ_NOUNMAP, /* do not free blocks when zeroing */

		__REQ_NOWAIT, /* Don't wait if request will block */
		__REQ_NR_BITS, /* stops here */
		};

		@@ -245,9 +245,9 @@ enum req_flag_bits {
		#define REQ_PREFLUSH (1ULL << __REQ_PREFLUSH)
		#define REQ_RAHEAD (1ULL << __REQ_RAHEAD)
		#define REQ_BACKGROUND (1ULL << __REQ_BACKGROUND)
		#define REQ_NOWAIT (1ULL << __REQ_NOWAIT)

		#define REQ_NOUNMAP (1ULL << __REQ_NOUNMAP)
		#define REQ_NOWAIT (1ULL << __REQ_NOWAIT)

		#define REQ_FAILFAST_MASK \
		(REQ_FAILFAST_DEV \| REQ_FAILFAST_TRANSPORT \| REQ_FAILFAST_DRIVER)