btrfs-progs: replace blkid_probe_get_wholedisk_devno

blkid_probe_get_wholedisk_devno() isn't available in some older
versions of libblkid.  It was used to work around an old
bug in blkid_devno_to_wholedisk(), but that has been fixed since
5cd0823 libblkid: fix blkid_devno_to_wholedisk(), present in
util-linux 2.17 and beyond.

If we happen to be missing that fix, the worst that happens is
that we'd fail to detect that a device is an ssd; the upside is
that this code compiles on older systems.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>

1 files changed, 5 insertions, 14 deletions

diff --git a/mkfs.c b/mkfs.c
index 96e9c4b3..a0c36ac4 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -1215,9 +1215,8 @@ static int check_leaf_or_node_size(u32 size, u32 sectorsize)
 
 static int is_ssd(const char *file)
 {
-	char *devname;
 	blkid_probe probe;
-	char *dev;
+	char dev[32];
 	char path[PATH_MAX];
 	dev_t disk;
 	int fd;
@@ -1227,24 +1226,16 @@ static int is_ssd(const char *file)
 	if (!probe)
 		return 0;
 
-	/*
-	 * We want to use blkid_devno_to_wholedisk() but it's broken for some
-	 * reason on F17 at least so we'll do this trickery
-	 */
-	disk = blkid_probe_get_wholedisk_devno(probe);
+	/* Device number of this disk (possibly a partition) */
+	disk = blkid_probe_get_devno(probe);
 	if (!disk)
 		return 0;
 
-	devname = blkid_devno_to_devname(disk);
-	if (!devname)
-		return 0;
-
-	dev = strrchr(devname, '/');
-	dev++;
+	/* Get whole disk name (not full path) for this devno */
+	blkid_devno_to_wholedisk(disk, dev, sizeof(dev), NULL);
 
 	snprintf(path, PATH_MAX, "/sys/block/%s/queue/rotational", dev);
 
-	free(devname);
 	blkid_free_probe(probe);
 
 	fd = open(path, O_RDONLY);