| Message ID | 20200925060031.4435-1-jefflexu@linux.alibaba.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: remove unused BLK_QC_T_EAGAIN flag | expand |
On 9/25/20 12:00 AM, Jeffle Xu wrote: > 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. Applied, thanks.
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)
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> --- include/linux/blk_types.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)