2 files changed, 4 insertions, 9 deletions
diff --git a/ioctl.h b/ioctl.h
index 5fb2ad18..a084f33e 100644
--- a/ioctl.h
+++ b/ioctl.h
@@ -23,7 +23,7 @@
 
 #define BTRFS_IOCTL_MAGIC 0x94
 #define BTRFS_VOL_NAME_MAX 255
-#define BTRFS_PATH_NAME_MAX 3072
+#define BTRFS_PATH_NAME_MAX 4087
 
 struct btrfs_ioctl_vol_args {
 	__s64 fd;
diff --git a/utils.c b/utils.c
index 694a92f3..8f49c7aa 100644
--- a/utils.c
+++ b/utils.c
@@ -653,18 +653,13 @@ void btrfs_register_one_device(char *fname)
 
 	fd = open("/dev/btrfs-control", O_RDONLY);
 	if (fd < 0) {
-		fprintf(stderr, "failed to open"
-			"/dev/btrfs-control\n");
-		exit(1);
+		fprintf(stderr, "failed to open /dev/btrfs-control "
+			"skipping device registration\n");
+		return;
 	}
 	strcpy(args.name, fname);
 	ret = ioctl(fd, BTRFS_IOC_SCAN_DEV, &args);
 	close(fd);
-	if (ret < 0) {
-		fprintf(stderr, "failed to register device %s\n",
-			fname);
-		exit(1);
-	}
 }
 
 int btrfs_scan_one_dir(char *dirname, int run_ioctl)