Fix open_container

open_container should open a container which contains the device,
but sometimes it would open another volume which contains the
device.  Be more careful in 'holder' selection.

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

1 files changed, 14 insertions, 0 deletions

diff --git a/util.c b/util.c
index eef0d6f..7f00b01 100644
--- a/util.c
+++ b/util.c
@@ -1315,6 +1315,20 @@ int open_container(int fd)
 			continue;
 		if (de->d_name[0] == '.')
 			continue;
+		/* Need to make sure it is a container and not a volume */
+		sprintf(e, "/%s/md/metadata_version", de->d_name);
+		dfd = open(path, O_RDONLY);
+		if (dfd < 0)
+			continue;
+		n = read(dfd, buf, sizeof(buf));
+		close(dfd);
+		if (n <= 0 || (unsigned)n >= sizeof(buf))
+			continue;
+		buf[n] = 0;
+		if (strncmp(buf, "external", 8) != 0 ||
+		    n < 10 ||
+		    buf[9] == '/')
+			continue;
 		sprintf(e, "/%s/dev", de->d_name);
 		dfd = open(path, O_RDONLY);
 		if (dfd < 0)