From 285b9c4b60ffd6373536b7973a826b8acf3666db Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Fri, 11 Jul 2008 22:02:21 +1000
Subject: [PATCH] --- yaml --- r: 104273 b: refs/heads/master c:
 26ef379f53993b1da3c19b63257cd47e1d9cd672 h: refs/heads/master i:   104271:
 6612efbb41caea9fcf06a73bcf3bf067a32afd27 v: v3

---
 [refs]                | 2 +-
 trunk/drivers/md/md.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7874eba2d4b0..e84684d93e6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80fab1d77b2852711917baa437e4fdab31c21fef
+refs/heads/master: 26ef379f53993b1da3c19b63257cd47e1d9cd672
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index bd1dc72ae522..328e247e2bf5 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -4186,15 +4186,12 @@ static int get_bitmap_file(mddev_t * mddev, void __user * arg)
 static int get_disk_info(mddev_t * mddev, void __user * arg)
 {
 	mdu_disk_info_t info;
-	unsigned int nr;
 	mdk_rdev_t *rdev;
 
 	if (copy_from_user(&info, arg, sizeof(info)))
 		return -EFAULT;
 
-	nr = info.number;
-
-	rdev = find_rdev_nr(mddev, nr);
+	rdev = find_rdev_nr(mddev, info.number);
 	if (rdev) {
 		info.major = MAJOR(rdev->bdev->bd_dev);
 		info.minor = MINOR(rdev->bdev->bd_dev);