From 3faff201362a36bf66bb3cdaf6da5dca40cc24e8 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 7 Apr 2009 08:59:11 +0200 Subject: [PATCH] --- yaml --- r: 142744 b: refs/heads/master c: 2385327725419a76cfbca7258abd95908b8ba9eb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 2 -- trunk/include/linux/blkdev.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7481eeb93a72..553e95e61abf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75e50984f062de2abc4bd84c642923e2c48ce2ae +refs/heads/master: 2385327725419a76cfbca7258abd95908b8ba9eb diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index 3688abff2430..43fdedc524ee 100644 --- a/trunk/block/blk-core.c +++ b/trunk/block/blk-core.c @@ -1123,8 +1123,6 @@ void init_request_from_bio(struct request *req, struct bio *bio) if (bio_sync(bio)) req->cmd_flags |= REQ_RW_SYNC; - if (bio_unplug(bio)) - req->cmd_flags |= REQ_UNPLUG; if (bio_rw_meta(bio)) req->cmd_flags |= REQ_RW_META; if (bio_noidle(bio)) diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h index e03660964e02..ba54c834a590 100644 --- a/trunk/include/linux/blkdev.h +++ b/trunk/include/linux/blkdev.h @@ -117,7 +117,6 @@ enum rq_flag_bits { __REQ_RW_META, /* metadata io request */ __REQ_COPY_USER, /* contains copies of user pages */ __REQ_INTEGRITY, /* integrity metadata has been remapped */ - __REQ_UNPLUG, /* unplug queue on submission */ __REQ_NOIDLE, /* Don't anticipate more IO after this one */ __REQ_NR_BITS, /* stops here */ }; @@ -145,7 +144,6 @@ enum rq_flag_bits { #define REQ_RW_META (1 << __REQ_RW_META) #define REQ_COPY_USER (1 << __REQ_COPY_USER) #define REQ_INTEGRITY (1 << __REQ_INTEGRITY) -#define REQ_UNPLUG (1 << __REQ_UNPLUG) #define REQ_NOIDLE (1 << __REQ_NOIDLE) #define BLK_MAX_CDB 16