diff options
author | Tejun Heo <tj@kernel.org> | 2010-09-03 05:56:16 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-09-10 06:35:36 -0400 |
commit | 6958f145459ca7ad9715024de97445addacb8510 (patch) | |
tree | c8c945eb68ceb88bd34647d7bcaedd13a0d753ca /drivers/block/xen-blkfront.c | |
parent | 589d7ed02ade0d06a3510da2e15a7edfdb2ef3d8 (diff) |
block: kill QUEUE_ORDERED_BY_TAG
Nobody is making meaningful use of ORDERED_BY_TAG now and queue
draining for barrier requests will be removed soon which will render
the advantage of tag ordering moot. Kill ORDERED_BY_TAG. The
following users are affected.
* brd: converted to ORDERED_DRAIN.
* virtio_blk: ORDERED_TAG path was already marked deprecated. Removed.
* xen-blkfront: ORDERED_TAG case dropped.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/xen-blkfront.c')
-rw-r--r-- | drivers/block/xen-blkfront.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index ac1b682edecb..50ec6f834996 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c | |||
@@ -424,8 +424,7 @@ static int xlvbd_barrier(struct blkfront_info *info) | |||
424 | const char *barrier; | 424 | const char *barrier; |
425 | 425 | ||
426 | switch (info->feature_barrier) { | 426 | switch (info->feature_barrier) { |
427 | case QUEUE_ORDERED_DRAIN: barrier = "enabled (drain)"; break; | 427 | case QUEUE_ORDERED_DRAIN: barrier = "enabled"; break; |
428 | case QUEUE_ORDERED_TAG: barrier = "enabled (tag)"; break; | ||
429 | case QUEUE_ORDERED_NONE: barrier = "disabled"; break; | 428 | case QUEUE_ORDERED_NONE: barrier = "disabled"; break; |
430 | default: return -EINVAL; | 429 | default: return -EINVAL; |
431 | } | 430 | } |
@@ -1078,8 +1077,7 @@ static void blkfront_connect(struct blkfront_info *info) | |||
1078 | * we're dealing with a very old backend which writes | 1077 | * we're dealing with a very old backend which writes |
1079 | * synchronously; draining will do what needs to get done. | 1078 | * synchronously; draining will do what needs to get done. |
1080 | * | 1079 | * |
1081 | * If there are barriers, then we can do full queued writes | 1080 | * If there are barriers, then we use flush. |
1082 | * with tagged barriers. | ||
1083 | * | 1081 | * |
1084 | * If barriers are not supported, then there's no much we can | 1082 | * If barriers are not supported, then there's no much we can |
1085 | * do, so just set ordering to NONE. | 1083 | * do, so just set ordering to NONE. |
@@ -1087,7 +1085,7 @@ static void blkfront_connect(struct blkfront_info *info) | |||
1087 | if (err) | 1085 | if (err) |
1088 | info->feature_barrier = QUEUE_ORDERED_DRAIN; | 1086 | info->feature_barrier = QUEUE_ORDERED_DRAIN; |
1089 | else if (barrier) | 1087 | else if (barrier) |
1090 | info->feature_barrier = QUEUE_ORDERED_TAG; | 1088 | info->feature_barrier = QUEUE_ORDERED_DRAIN_FLUSH; |
1091 | else | 1089 | else |
1092 | info->feature_barrier = QUEUE_ORDERED_NONE; | 1090 | info->feature_barrier = QUEUE_ORDERED_NONE; |
1093 | 1091 | ||