From 36dcac288e7ccdebb2b442d695656d81639d048c Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Wed, 4 Sep 2013 19:43:20 +0800 Subject: Btrfs-progs: fix compile warning in is_ssd() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mkfs.c: In function ‘is_ssd’: mkfs.c:1168:26: warning: ignoring return value of ‘blkid_devno_to_wholedisk’, declared with attribute warn_unused_result [-Wunused-result] blkid_devno_to_wholedisk(devno, wholedisk, sizeof(wholedisk), NULL); Signed-off-by: Wang Shilong Signed-off-by: David Sterba Signed-off-by: Chris Mason --- mkfs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mkfs.c b/mkfs.c index 69df39b7..9ccb4ace 100644 --- a/mkfs.c +++ b/mkfs.c @@ -1150,6 +1150,7 @@ static int is_ssd(const char *file) dev_t devno; int fd; char rotational; + int ret; probe = blkid_new_probe_from_filename(file); if (!probe) @@ -1161,7 +1162,12 @@ static int is_ssd(const char *file) return 0; /* Get whole disk name (not full path) for this devno */ - blkid_devno_to_wholedisk(devno, wholedisk, sizeof(wholedisk), NULL); + ret = blkid_devno_to_wholedisk(devno, + wholedisk, sizeof(wholedisk), NULL); + if (ret) { + blkid_free_probe(probe); + return 0; + } snprintf(sysfs_path, PATH_MAX, "/sys/block/%s/queue/rotational", wholedisk); -- cgit v1.2.3