summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffle Xu <jefflexu@linux.alibaba.com>2020-09-25 08:00:31 +0200
committerJens Axboe <axboe@kernel.dk>2020-09-25 15:54:50 +0200
commit3aab91774bbd8e571cfaddaf839aafd07718333c (patch)
tree68551fb87669b2e0d2d7132a828c7ba2e2924d36
parentMerge tag 'nvme-5.9-2020-09-24' of git://git.infradead.org/nvme into block-5.9 (diff)
downloadlinux-3aab91774bbd8e571cfaddaf839aafd07718333c.tar.xz
linux-3aab91774bbd8e571cfaddaf839aafd07718333c.zip
block: remove unused BLK_QC_T_EAGAIN flag
commit 7b6620d7db56 ("block: remove REQ_NOWAIT_INLINE") removed the REQ_NOWAIT_INLINE related code, but the diff wasn't applied to blk_types.h somehow. Then commit 2771cefeac49 ("block: remove the REQ_NOWAIT_INLINE flag") removed the REQ_NOWAIT_INLINE flag while the BLK_QC_T_EAGAIN flag still remains. Fixes: 7b6620d7db56 ("block: remove REQ_NOWAIT_INLINE") Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--include/linux/blk_types.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 4ecf4fed171f..b3fc5d3dd8ea 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -497,13 +497,12 @@ static inline int op_stat_group(unsigned int op)
typedef unsigned int blk_qc_t;
#define BLK_QC_T_NONE -1U
-#define BLK_QC_T_EAGAIN -2U
#define BLK_QC_T_SHIFT 16
#define BLK_QC_T_INTERNAL (1U << 31)
static inline bool blk_qc_t_valid(blk_qc_t cookie)
{
- return cookie != BLK_QC_T_NONE && cookie != BLK_QC_T_EAGAIN;
+ return cookie != BLK_QC_T_NONE;
}
static inline unsigned int blk_qc_t_to_queue_num(blk_qc_t cookie)