X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fzpool%2Fzpool_vdev.c;h=fe6dd3bbd9ceb497352dcf718086c764d344eddf;hb=01c0e61da027925b71c923a2b3896abf458b45a9;hp=febdda95f48bba4588af76a5ea5b3ace1dcb35be;hpb=d603ed6c278f9c25b17ba8e75e9bce6e5d715ac0;p=zfs.git

diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c
index febdda9..fe6dd3b 100644
--- a/cmd/zpool/zpool_vdev.c
+++ b/cmd/zpool/zpool_vdev.c
@@ -384,23 +384,9 @@ static int
 is_shorthand_path(const char *arg, char *path,
                   struct stat64 *statbuf, boolean_t *wholedisk)
 {
-	char dirs[5][8] = {"by-id", "by-label", "by-path", "by-uuid", "zpool"};
-	int i, err;
-
-	/* /dev/<name> */
-	(void) snprintf(path, MAXPATHLEN, "%s/%s", DISK_ROOT, arg);
-	*wholedisk = is_whole_disk(path);
-	err = stat64(path, statbuf);
-	if (*wholedisk || err == 0)
-		return (0);
-
-	/* /dev/disk/<dirs>/<name> */
-	for (i = 0; i < 5; i++) {
-		(void) snprintf(path, MAXPATHLEN, "%s/%s/%s",
-		    UDISK_ROOT, dirs[i], arg);
+	if (zfs_resolve_shortname(arg, path, MAXPATHLEN) == 0) {
 		*wholedisk = is_whole_disk(path);
-		err = stat64(path, statbuf);
-		if (*wholedisk || err == 0)
+		if (*wholedisk || (stat64(path, statbuf) == 0))
 			return (0);
 	}
 
@@ -513,43 +499,6 @@ make_leaf_vdev(const char *arg, uint64_t is_log)
 		verify(nvlist_add_uint64(vdev, ZPOOL_CONFIG_WHOLE_DISK,
 		    (uint64_t)wholedisk) == 0);
 
-#if defined(__sun__) || defined(__sun)
-	/*
-	 * For a whole disk, defer getting its devid until after labeling it.
-	 */
-	if (S_ISBLK(statbuf.st_mode) && !wholedisk) {
-		/*
-		 * Get the devid for the device.
-		 */
-		int fd;
-		ddi_devid_t devid;
-		char *minor = NULL, *devid_str = NULL;
-
-		if ((fd = open(path, O_RDONLY|O_EXCL)) < 0) {
-			(void) fprintf(stderr, gettext("cannot open '%s': "
-			    "%s\n"), path, strerror(errno));
-			nvlist_free(vdev);
-			return (NULL);
-		}
-
-		if (devid_get(fd, &devid) == 0) {
-			if (devid_get_minor_name(fd, &minor) == 0 &&
-			    (devid_str = devid_str_encode(devid, minor)) !=
-			    NULL) {
-				verify(nvlist_add_string(vdev,
-				    ZPOOL_CONFIG_DEVID, devid_str) == 0);
-			}
-			if (devid_str != NULL)
-				devid_str_free(devid_str);
-			if (minor != NULL)
-				devid_str_free(minor);
-			devid_free(devid);
-		}
-
-		(void) close(fd);
-	}
-#endif
-
 	return (vdev);
 }
 
@@ -960,8 +909,10 @@ make_disks(zpool_handle_t *zhp, nvlist_t *nv)
 	nvlist_t **child;
 	uint_t c, children;
 	char *type, *path, *diskname;
-	char buf[MAXPATHLEN];
+	char devpath[MAXPATHLEN];
+	char udevpath[MAXPATHLEN];
 	uint64_t wholedisk;
+	struct stat64 statbuf;
 	int ret;
 
 	verify(nvlist_lookup_string(nv, ZPOOL_CONFIG_TYPE, &type) == 0);
@@ -988,38 +939,42 @@ make_disks(zpool_handle_t *zhp, nvlist_t *nv)
 			return (ret);
 		}
 
-		if (realpath(path, buf) == NULL) {
+		if (realpath(path, devpath) == NULL) {
 			ret = errno;
 			(void) fprintf(stderr,
 			    gettext("cannot resolve path '%s'\n"), path);
 			return (ret);
 		}
 
-		diskname = strrchr(buf, '/');
+		/*
+		 * Remove any previously existing symlink from a udev path to
+		 * the device before labeling the disk.  This makes
+		 * zpool_label_disk_wait() truly wait for the new link to show
+		 * up instead of returning if it finds an old link still in
+		 * place.  Otherwise there is a window between when udev
+		 * deletes and recreates the link during which access attempts
+		 * will fail with ENOENT.
+		 */
+		zfs_append_partition(path, udevpath, sizeof (udevpath));
+		if ((strncmp(udevpath, UDISK_ROOT, strlen(UDISK_ROOT)) == 0) &&
+		    (lstat64(udevpath, &statbuf) == 0) &&
+		    S_ISLNK(statbuf.st_mode))
+			(void) unlink(udevpath);
+
+		diskname = strrchr(devpath, '/');
 		assert(diskname != NULL);
 		diskname++;
 		if (zpool_label_disk(g_zfs, zhp, diskname) == -1)
 			return (-1);
 
 		/*
-		 * Now the we've labeled the disk and the partitions have
-		 * been created.  We still need to wait for udev to create
-		 * the symlinks to those partitions.  If we are accessing
-		 * the devices via a udev disk path, /dev/disk, then wait
-		 * for *-part# to be created.  Otherwise just use the normal
-		 * syntax for devices in /dev.
+		 * Now we've labeled the disk and the partitions have been
+		 * created.  We still need to wait for udev to create the
+		 * symlinks to those partitions.
 		 */
-		if (strncmp(path, UDISK_ROOT, strlen(UDISK_ROOT)) == 0)
-			(void) snprintf(buf, sizeof (buf),
-			    "%s%s%s", path, "-part", FIRST_SLICE);
-		else
-			(void) snprintf(buf, sizeof (buf),
-			    "%s%s%s", path, isdigit(path[strlen(path)-1]) ?
-			    "p" : "", FIRST_SLICE);
-
-		if ((ret = zpool_label_disk_wait(buf, 1000)) != 0) {
+		if ((ret = zpool_label_disk_wait(udevpath, 1000)) != 0) {
 			(void) fprintf(stderr,
-			    gettext( "cannot resolve path '%s'\n"), buf);
+			    gettext( "cannot resolve path '%s'\n"), udevpath);
 			return (-1);
 		}
 
@@ -1029,10 +984,10 @@ make_disks(zpool_handle_t *zhp, nvlist_t *nv)
 		 * chop off the slice number when displaying the device in
 		 * future output.
 		 */
-		verify(nvlist_add_string(nv, ZPOOL_CONFIG_PATH, buf) == 0);
+		verify(nvlist_add_string(nv, ZPOOL_CONFIG_PATH, udevpath) == 0);
 
 		/* Just in case this partition already existed. */
-		(void) zero_label(buf);
+		(void) zero_label(udevpath);
 
 		return (0);
 	}