From: Masatake YAMATO <yamato@redhat.com>
Date: Thu, 16 Sep 2021 15:46:39 +0000 (+0900)
Subject: lsfd: remove redundant "nodev:" prefix from DEVNAME column
X-Git-Tag: v2.38-rc1~144^2~90
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb5fc0a0f3dd7481cc463b10a48eac4681b8e611;p=thirdparty%2Futil-linux.git

lsfd: remove redundant "nodev:" prefix from DEVNAME column

Reflecting the review comment:

    remove "nodev:" from DEVNAME

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/misc-utils/lsfd-fifo.c b/misc-utils/lsfd-fifo.c
index 3617d5afb6..7c1539b6ac 100644
--- a/misc-utils/lsfd-fifo.c
+++ b/misc-utils/lsfd-fifo.c
@@ -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;
diff --git a/misc-utils/lsfd-file.c b/misc-utils/lsfd-file.c
index 0c88c8569d..0005ebf369 100644
--- a/misc-utils/lsfd-file.c
+++ b/misc-utils/lsfd-file.c
@@ -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;
 			}
 		}
diff --git a/misc-utils/lsfd-sock.c b/misc-utils/lsfd-sock.c
index b5df8c1ebf..abe48f7039 100644
--- a/misc-utils/lsfd-sock.c
+++ b/misc-utils/lsfd-sock.c
@@ -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;
diff --git a/misc-utils/lsfd-unkn.c b/misc-utils/lsfd-unkn.c
index 2479d16a0b..236a31a369 100644
--- a/misc-utils/lsfd-unkn.c
+++ b/misc-utils/lsfd-unkn.c
@@ -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;