From: NeilBrown <neilb@suse.de>
Date: Thu, 10 Mar 2011 00:36:47 +0000 (+1100)
Subject: Remove incorrect use of open_dev
X-Git-Tag: mdadm-3.2.1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8b8eda80484a2d4ce4a1a00400924033d212c57;p=thirdparty%2Fmdadm.git

Remove incorrect use of open_dev

open_dev can only be used for md array.  To open an
arbitrary device, dev_open must be used.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Assemble.c b/Assemble.c
index 0ffbbc9a..bfc879c7 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -1555,8 +1555,13 @@ int assemble_container_content(struct supertype *st, int mdfd,
 			for (i=0; i<spare; i++)
 				fdlist[i] = -1;
 			for (dev = content->devs; dev; dev = dev->next) {
-				int fd = open_dev(makedev(dev->disk.major,
-							  dev->disk.minor));
+				char buf[20];
+				int fd;
+				sprintf(buf, "%d:%d",
+					dev->disk.major,
+					dev->disk.minor);
+				fd = dev_open(buf, O_RDWR);
+
 				if (dev->disk.raid_disk >= 0)
 					fdlist[dev->disk.raid_disk] = fd;
 				else