From: Mike Miller (OS Dev) <mikem@beardog.cca.cpqcorp.net>
Date: Thu, 5 Apr 2007 02:08:23 +0000 (-0700)
Subject: [PATCH] cciss: add init of drv->cylinders back to cciss_geometry_inquiry
X-Git-Tag: v2.6.21-rc6~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7f42d3b8a72ab585f3166a269276c8cca12088af;p=linux-2.6-omap-h63xx.git

[PATCH] cciss: add init of drv->cylinders back to cciss_geometry_inquiry

This patch adds initialization of drv->cylinders back into the failing case in
cciss_geometry_inquiry. I inadvertently removed it in one my 2TB updates.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 072e18e6d76..14d780666c0 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1915,6 +1915,7 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,
 			       "does not support reading geometry\n");
 			drv->heads = 255;
 			drv->sectors = 32;	// Sectors per track
+			drv->cylinders = total_size + 1;
 			drv->raid_level = RAID_UNKNOWN;
 		} else {
 			drv->heads = inq_buff->data_byte[6];