diff options
| author |   Christoph Hellwig <hch@lst.de> | 2017-11-02 21:29:48 +0300 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2017-11-03 10:31:48 -0600 |
| commit | 8977f563845bdd61fc61c4dfb399270b7d5667c6 (patch) | |
| tree | 737c8520bdb6c8aa212fb5281cf13c66061b6ff8 /include/linux/blk_types.h | |
| parent | Merge branch 'nvme-4.15' of git://git.infradead.org/nvme into for-4.15/block (diff) | |
| download | wireguard-linux-8977f563845bdd61fc61c4dfb399270b7d5667c6.tar.xz wireguard-linux-8977f563845bdd61fc61c4dfb399270b7d5667c6.zip | |
block: move REQ_NOWAIT
This flag should be before the operation-specific REQ_NOUNMAP bit.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/blk_types.h')
| -rw-r--r-- | include/linux/blk_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 3385c89f402e..c4c6c8bced2e 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -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) |