X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fvdev_disk.c;h=cbf0a4d4fb0896c74f34ceeb4899d2f91675eea5;hb=ff80d9b142826c15fa84e3c4b9ef1795fd6e9485;hp=8df43d150f70f534e7b7ecc5ca9ae7881d584ccd;hpb=f21e5c6a17ee7c1a27fdcb93d29d8b7b5a158053;p=zfs.git

diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c
index 8df43d1..cbf0a4d 100644
--- a/module/zfs/vdev_disk.c
+++ b/module/zfs/vdev_disk.c
@@ -121,8 +121,15 @@ vdev_elevator_switch(vdev_t *v, char *elevator)
 	char *device = bdev->bd_disk->disk_name;
 	int error;
 
-	/* Skip devices which are not whole disks (partitions) */
-	if (!v->vdev_wholedisk)
+	/*
+	 * Skip devices which are not whole disks (partitions).
+	 * Device-mapper devices are excepted since they may be whole
+	 * disks despite the vdev_wholedisk flag, in which case we can
+	 * and should switch the elevator. If the device-mapper device
+	 * does not have an elevator (i.e. dm-raid, dm-crypt, etc.) the
+	 * "Skip devices without schedulers" check below will fail.
+	 */
+	if (!v->vdev_wholedisk && strncmp(device, "dm-", 3) != 0)
 		return (0);
 
 	/* Skip devices without schedulers (loop, ram, dm, etc) */
@@ -152,7 +159,7 @@ vdev_elevator_switch(vdev_t *v, char *elevator)
 		char *envp[] = { NULL };
 
 		argv[2] = kmem_asprintf(SET_SCHEDULER_CMD, device, elevator);
-		error = call_usermodehelper(argv[0], argv, envp, 1);
+		error = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC);
 		strfree(argv[2]);
 	}
 #endif /* HAVE_ELEVATOR_CHANGE */