]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
lsblk: simplify code by ul_path_count_dirents()
authorKarel Zak <kzak@redhat.com>
Mon, 6 Jun 2022 10:36:13 +0000 (12:36 +0200)
committerKarel Zak <kzak@redhat.com>
Mon, 6 Jun 2022 10:36:13 +0000 (12:36 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
misc-utils/lsblk.c

index a09ff2a1feb7cf22767c95319c5f677105581ac1..41fc922574eae53fbe044d7e3a2836cf773ba9a6 100644 (file)
@@ -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);
 }