aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/blk_types.h
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-05-20 20:52:16 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-05-20 20:52:16 +0200
commit771949d03b4f5295f648f09141325fd478f6c7ce (patch)
tree5e69b743566cc8f1eaafffcd03554bbd2b84e028 /include/linux/blk_types.h
parent0eb8e885726a3a93206510092bbc7e39e272f6ef (diff)
downloadkernel_samsung_smdk4412-771949d03b4f5295f648f09141325fd478f6c7ce.zip
kernel_samsung_smdk4412-771949d03b4f5295f648f09141325fd478f6c7ce.tar.gz
kernel_samsung_smdk4412-771949d03b4f5295f648f09141325fd478f6c7ce.tar.bz2
block: get rid of on-stack plugging debug checks
We don't need them anymore, so kill: - REQ_ON_PLUG checks in various places - !rq_mergeable() check in plug merging Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'include/linux/blk_types.h')
-rw-r--r--include/linux/blk_types.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index be50d9e..2a7cea5 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -151,7 +151,6 @@ enum rq_flag_bits {
__REQ_IO_STAT, /* account I/O stat */
__REQ_MIXED_MERGE, /* merge of different types, fail separately */
__REQ_SECURE, /* secure discard (used with __REQ_DISCARD) */
- __REQ_ON_PLUG, /* on plug list */
__REQ_NR_BITS, /* stops here */
};
@@ -192,6 +191,5 @@ enum rq_flag_bits {
#define REQ_IO_STAT (1 << __REQ_IO_STAT)
#define REQ_MIXED_MERGE (1 << __REQ_MIXED_MERGE)
#define REQ_SECURE (1 << __REQ_SECURE)
-#define REQ_ON_PLUG (1 << __REQ_ON_PLUG)
#endif /* __LINUX_BLK_TYPES_H */