btrfs-progs: use clearer var names in is_ssd()
authorEric Sandeen <sandeen@redhat.com>
Thu, 11 Apr 2013 15:44:18 +0000 (10:44 -0500)
committerDavid Sterba <dsterba@suse.cz>
Tue, 23 Apr 2013 16:56:26 +0000 (18:56 +0200)
is_ssd() uses nondescript variable names; path - to what?
disk - it's a dev_t not a disk name, unlike dev, which is
a name not a dev_t!

Rename some vars to make things hopefully clearer:

 wholedisk - the name of the node for the entire disk
 devno - the dev_t of the device we're mkfs'ing
 sysfs_path - the path in sysfs we ultimately check

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

diff --git a/mkfs.c b/mkfs.c
index a0c36ac..7ff60e5 100644 (file)
--- a/mkfs.c
+++ b/mkfs.c
@@ -1216,9 +1216,9 @@ static int check_leaf_or_node_size(u32 size, u32 sectorsize)
 static int is_ssd(const char *file)
 {
        blkid_probe probe;
-       char dev[32];
-       char path[PATH_MAX];
-       dev_t disk;
+       char wholedisk[32];
+       char sysfs_path[PATH_MAX];
+       dev_t devno;
        int fd;
        char rotational;
 
@@ -1227,18 +1227,19 @@ static int is_ssd(const char *file)
                return 0;
 
        /* Device number of this disk (possibly a partition) */
-       disk = blkid_probe_get_devno(probe);
-       if (!disk)
+       devno = blkid_probe_get_devno(probe);
+       if (!devno)
                return 0;
 
        /* Get whole disk name (not full path) for this devno */
-       blkid_devno_to_wholedisk(disk, dev, sizeof(dev), NULL);
+       blkid_devno_to_wholedisk(devno, wholedisk, sizeof(wholedisk), NULL);
 
-       snprintf(path, PATH_MAX, "/sys/block/%s/queue/rotational", dev);
+       snprintf(sysfs_path, PATH_MAX, "/sys/block/%s/queue/rotational",
+                wholedisk);
 
        blkid_free_probe(probe);
 
-       fd = open(path, O_RDONLY);
+       fd = open(sysfs_path, O_RDONLY);
        if (fd < 0) {
                return 0;
        }