]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
lsfd: remove redundant "nodev:" prefix from DEVNAME column
authorMasatake YAMATO <yamato@redhat.com>
Thu, 16 Sep 2021 15:46:39 +0000 (00:46 +0900)
committerKarel Zak <kzak@redhat.com>
Wed, 6 Oct 2021 09:01:54 +0000 (11:01 +0200)
Reflecting the review comment:

    remove "nodev:" from DEVNAME

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
misc-utils/lsfd-fifo.c
misc-utils/lsfd-file.c
misc-utils/lsfd-sock.c
misc-utils/lsfd-unkn.c

index 3617d5afb622b1a3bce895f3c4074f7aadc000fb..7c1539b6acfaf84349c5ef44fb86eab4ca1c867a 100644 (file)
@@ -41,7 +41,7 @@ static bool fifo_fill_column(struct proc *proc __attribute__((__unused__)),
        case COL_DEVNAME:
                if (major(file->stat.st_dev) == 0
                    && strncmp(file->name, "pipe:", 5) == 0) {
-                       str = strdup("nodev:pipefs");
+                       str = strdup("pipefs");
                        break;
                }
                return false;
index 0c88c8569da608a2d0a4318a59e1b8397267cb7e..0005ebf3692db24ca64c9c59366eb1dfcc86addb 100644 (file)
@@ -233,7 +233,7 @@ static bool file_fill_column(struct proc *proc,
                if (major(file->stat.st_dev) == 0) {
                        const char *filesystem = get_nodev_filesystem(minor(file->stat.st_dev));
                        if (filesystem) {
-                               xasprintf(&str, "nodev:%s", filesystem);
+                               xasprintf(&str, "%s", filesystem);
                                break;
                        }
                }
index b5df8c1ebfd978e416fd8842ba72d725a4c008a6..abe48f703940b33629b2d5da9970b43aba95f8e1 100644 (file)
@@ -61,7 +61,7 @@ static bool sock_fill_column(struct proc *proc __attribute__((__unused__)),
        case COL_DEVNAME:
                if (major(file->stat.st_dev) == 0
                    && strncmp(file->name, "socket:", 7) == 0) {
-                       str = strdup("nodev:sockfs");
+                       str = strdup("sockfs");
                        break;
                }
                return false;
index 2479d16a0b30e4108ec6642a341d0f134b7ae3d1..236a31a3693117a86a46d4d9727fb8cce7248f29 100644 (file)
@@ -41,7 +41,7 @@ static bool unkn_fill_column(struct proc *proc __attribute__((__unused__)),
        case COL_DEVNAME:
                if (major(file->stat.st_dev) == 0
                    && strncmp(file->name, "anon_inode:", 11) == 0) {
-                       str = strdup("nodev:anon_inodefs");
+                       str = strdup("anon_inodefs");
                        break;
                }
                return false;