[PATCH 1/2] Revert "UBUNTU: SAUCE: Improve Amazon EBS performance for EC2 -- fixes for v3.5-rc6"

Stefan Bader stefan.bader at canonical.com
Mon Sep 17 15:26:33 UTC 2012


This reverts commit be1d52ea78d9a08827fd0f2945e610d794ad718a as it
is not needed/used.

Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
---
 drivers/block/xen-blkfront.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 72edd45..43860d3 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -763,7 +763,6 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
 	unsigned long flags;
 	struct blkfront_info *info = (struct blkfront_info *)dev_id;
 	int error;
-	int ring_size = __RING_SIZE((struct blkif_sring *)0, info->num_ring_pages * PAGE_SIZE);
 
 	spin_lock_irqsave(&info->io_lock, flags);
 
@@ -786,7 +785,7 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
 		 * never have given to it (we stamp it up to BLK_RING_SIZE -
 		 * look in get_id_from_freelist.
 		 */
-		if (id >= ring_size) {
+		if (id >= BLK_RING_SIZE) {
 			WARN(1, "%s: response to %s has incorrect id (%ld)\n",
 			     info->gd->disk_name, op_name(bret->operation), id);
 			/* We can't safely get the 'struct request' as
-- 
1.7.9.5





More information about the kernel-team mailing list