From: Karel Zak <kzak@redhat.com>
Date: Mon, 6 Jun 2022 10:36:13 +0000 (+0200)
Subject: lsblk: simplify code by ul_path_count_dirents()
X-Git-Tag: v2.39-rc1~630
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26f6fa2ba3b48092315093379846997ed6bd59f6;p=thirdparty%2Futil-linux.git

lsblk: simplify code by ul_path_count_dirents()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index a09ff2a1fe..41fc922574 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -750,28 +750,17 @@ static void device_read_bytes(struct lsblk_device *dev, char *path, char **str,
 
 static void process_mq(struct lsblk_device *dev, char **str)
 {
-	DIR *dir;
-	struct dirent *d;
 	unsigned int queues = 0;
 
 	DBG(DEV, ul_debugobj(dev, "%s: process mq", dev->name));
 
-	dir = ul_path_opendir(dev->sysfs, "mq");
-	if (!dir) {
+	queues = ul_path_count_dirents(dev->sysfs, "mq");
+	if (!queues) {
 		*str = xstrdup("1");
 		DBG(DEV, ul_debugobj(dev, "%s: no mq supported, use a single queue", dev->name));
 		return;
 	}
 
-	while ((d = xreaddir(dir))) {
-		if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
-			continue;
-
-		queues++;
-	}
-
-	closedir(dir);
-
 	DBG(DEV, ul_debugobj(dev, "%s: has %d queues", dev->name, queues));
 	xasprintf(str, "%3u", queues);
 }