All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Sandeen <sandeen@redhat.com>
To: linux-btrfs <linux-btrfs@vger.kernel.org>
Subject: [PATCH 2/2] btrfs-progs: use clearer var names in is_ssd()
Date: Thu, 11 Apr 2013 10:44:18 -0500	[thread overview]
Message-ID: <5166DA52.7000809@redhat.com> (raw)
In-Reply-To: <5166D932.5010105@redhat.com>

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>
---

Hopefully that's slightly clearer; if not, this patch is
just cleanup, so it's not at all critical.

diff --git a/mkfs.c b/mkfs.c
index 7df78fc..d735d65 100644
--- 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;
 	}



  reply	other threads:[~2013-04-11 15:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-11 15:39 [PATCH 1/2] btrfs-progs: replace blkid_probe_get_wholedisk_devno Eric Sandeen
2013-04-11 15:44 ` Eric Sandeen [this message]
2013-04-12 17:17   ` [PATCH 2/2] btrfs-progs: use clearer var names in is_ssd() Zach Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5166DA52.7000809@redhat.com \
    --to=sandeen@redhat.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.