aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-04-07 02:59:11 -0400
committerJens Axboe <jens.axboe@oracle.com>2009-04-07 02:59:11 -0400
commit2385327725419a76cfbca7258abd95908b8ba9eb (patch)
treedee9c8167092707fbd3f1b1c5fdadc33ccf924a5
parent75e50984f062de2abc4bd84c642923e2c48ce2ae (diff)
block: remove unused REQ_UNPLUG
The request inherits the unplug flag from the bio, but it isn't actually used. The bio flag stops at __make_request(), which tells it to unplug after submission. Passing it on to the request doesn't make any sense. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--block/blk-core.c2
-rw-r--r--include/linux/blkdev.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 3688abff2430..43fdedc524ee 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1123,8 +1123,6 @@ void init_request_from_bio(struct request *req, struct bio *bio)
1123 1123
1124 if (bio_sync(bio)) 1124 if (bio_sync(bio))
1125 req->cmd_flags |= REQ_RW_SYNC; 1125 req->cmd_flags |= REQ_RW_SYNC;
1126 if (bio_unplug(bio))
1127 req->cmd_flags |= REQ_UNPLUG;
1128 if (bio_rw_meta(bio)) 1126 if (bio_rw_meta(bio))
1129 req->cmd_flags |= REQ_RW_META; 1127 req->cmd_flags |= REQ_RW_META;
1130 if (bio_noidle(bio)) 1128 if (bio_noidle(bio))
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e03660964e02..ba54c834a590 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -117,7 +117,6 @@ enum rq_flag_bits {
117 __REQ_RW_META, /* metadata io request */ 117 __REQ_RW_META, /* metadata io request */
118 __REQ_COPY_USER, /* contains copies of user pages */ 118 __REQ_COPY_USER, /* contains copies of user pages */
119 __REQ_INTEGRITY, /* integrity metadata has been remapped */ 119 __REQ_INTEGRITY, /* integrity metadata has been remapped */
120 __REQ_UNPLUG, /* unplug queue on submission */
121 __REQ_NOIDLE, /* Don't anticipate more IO after this one */ 120 __REQ_NOIDLE, /* Don't anticipate more IO after this one */
122 __REQ_NR_BITS, /* stops here */ 121 __REQ_NR_BITS, /* stops here */
123}; 122};
@@ -145,7 +144,6 @@ enum rq_flag_bits {
145#define REQ_RW_META (1 << __REQ_RW_META) 144#define REQ_RW_META (1 << __REQ_RW_META)
146#define REQ_COPY_USER (1 << __REQ_COPY_USER) 145#define REQ_COPY_USER (1 << __REQ_COPY_USER)
147#define REQ_INTEGRITY (1 << __REQ_INTEGRITY) 146#define REQ_INTEGRITY (1 << __REQ_INTEGRITY)
148#define REQ_UNPLUG (1 << __REQ_UNPLUG)
149#define REQ_NOIDLE (1 << __REQ_NOIDLE) 147#define REQ_NOIDLE (1 << __REQ_NOIDLE)
150 148
151#define BLK_MAX_CDB 16 149#define BLK_MAX_CDB 16