From: Mike Miller <mike.miller@hp.com>
Date: Thu, 7 Dec 2006 04:35:08 +0000 (-0800)
Subject: [PATCH] cciss: change cciss_open for consistency
X-Git-Tag: v2.6.20-rc1~145^2^2~250
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7a06f789e0a1b46e4ed2a68f885cbe5ff74a34d6;p=linux-2.6-omap-h63xx.git

[PATCH] cciss: change cciss_open for consistency

Change our open to test for drv->heads like we do in other places in the
driver.  Mostly for consistency.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index e61279f6f26..c8343051be9 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -494,7 +494,7 @@ static int cciss_open(struct inode *inode, struct file *filep)
 	 * but I'm already using way to many device nodes to claim another one
 	 * for "raw controller".
 	 */
-	if (drv->nr_blocks == 0) {
+	if (drv->heads == 0) {
 		if (iminor(inode) != 0) {	/* not node 0? */
 			/* if not node 0 make sure it is a partition = 0 */
 			if (iminor(inode) & 0x0f) {