From c16c3e14c5429b9d6bd47952c47e5256164c6e02 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Thu, 26 Aug 2010 13:55:49 -0500
Subject: [PATCH] --- yaml --- r: 213079 b: refs/heads/master c:
 252161094255ffdc277b8a0e5e12b0a8ff67b10f h: refs/heads/master i:   213077:
 5115c6bfa7309bf6c0b96c21af8d4021ef870a74   213075:
 1f8fbbadb858e2018e753bdf5a93630b4dc82732   213071:
 b4809af63b379fc406f428f4f38251c59fa811cb v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/block/cciss.c | 28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index ffe4589ded9f..c3503793e9b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c800eed9a46f7b6a469d24e7e6051b23e62bb69
+refs/heads/master: 252161094255ffdc277b8a0e5e12b0a8ff67b10f
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 5119c8837cf5..9a3dd20ea93a 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -1291,6 +1291,20 @@ static int cciss_setintinfo(ctlr_info_t *h, void __user *argp)
 	return 0;
 }
 
+static int cciss_getnodename(ctlr_info_t *h, void __user *argp)
+{
+	NodeName_type NodeName;
+	int i;
+
+	if (!argp)
+		return -EINVAL;
+	for (i = 0; i < 16; i++)
+		NodeName[i] = readb(&h->cfgtable->ServerName[i]);
+	if (copy_to_user(argp, NodeName, sizeof(NodeName_type)))
+		return -EFAULT;
+	return 0;
+}
+
 static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
 		       unsigned int cmd, unsigned long arg)
 {
@@ -1309,19 +1323,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
 	case CCISS_SETINTINFO:
 		return cciss_setintinfo(h, argp);
 	case CCISS_GETNODENAME:
-		{
-			NodeName_type NodeName;
-			int i;
-
-			if (!arg)
-				return -EINVAL;
-			for (i = 0; i < 16; i++)
-				NodeName[i] =
-				    readb(&h->cfgtable->ServerName[i]);
-			if (copy_to_user(argp, NodeName, sizeof(NodeName_type)))
-				return -EFAULT;
-			return 0;
-		}
+		return cciss_getnodename(h, argp);
 	case CCISS_SETNODENAME:
 		{
 			NodeName_type NodeName;