From: Masatake YAMATO <yamato@redhat.com>
Date: Thu, 10 Nov 2022 20:54:28 +0000 (+0900)
Subject: lsfd: introduce is_opened_file macro
X-Git-Tag: v2.39-rc1~406^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0f84bd12dc6925dab7d37da76360e35812baa30;p=thirdparty%2Futil-linux.git

lsfd: introduce is_opened_file macro

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

diff --git a/misc-utils/lsfd-file.c b/misc-utils/lsfd-file.c
index c82105c75e..0c473fdded 100644
--- a/misc-utils/lsfd-file.c
+++ b/misc-utils/lsfd-file.c
@@ -153,11 +153,11 @@ static bool file_fill_column(struct proc *proc,
 			err(EXIT_FAILURE, _("failed to add output data"));
 		return true;
 	case COL_FD:
-		if (file->association < 0)
+		if (!is_opened_file(file))
 			return false;
 		/* FALL THROUGH */
 	case COL_ASSOC:
-		if (file->association >= 0)
+		if (is_opened_file(file))
 			xasprintf(&str, "%d", file->association);
 		else {
 			int assoc = file->association * -1;
@@ -221,7 +221,7 @@ static bool file_fill_column(struct proc *proc,
 		xasprintf(&str, "%u", proc->kthread);
 		break;
 	case COL_MNT_ID:
-		xasprintf(&str, "%d", file->association < 0? 0: file->mnt_id);
+		xasprintf(&str, "%d", is_opened_file(file)? file->mnt_id: 0);
 		break;
 	case COL_MODE:
 		if (does_file_has_fdinfo_alike(file))
@@ -241,7 +241,7 @@ static bool file_fill_column(struct proc *proc,
 	case COL_FLAGS: {
 		struct ul_buffer buf = UL_INIT_BUFFER;
 
-		if (file->association < 0)
+		if (!is_opened_file(file))
 			return true;
 
 		if (file->sys_flags == 0)
diff --git a/misc-utils/lsfd-sock.c b/misc-utils/lsfd-sock.c
index e99e235089..83f35e5d4f 100644
--- a/misc-utils/lsfd-sock.c
+++ b/misc-utils/lsfd-sock.c
@@ -133,7 +133,7 @@ static void init_sock_content(struct file *file)
 
 		assert(file->proc);
 
-		if (fd >= 0)
+		if (is_opened_file(file))
 			sprintf(path, "/proc/%d/fd/%d", file->proc->pid, fd);
 		else
 			sprintf(path, "/proc/%d/map_files/%"PRIx64 "-%" PRIx64,
diff --git a/misc-utils/lsfd.h b/misc-utils/lsfd.h
index ccf33ae41c..d6329c6968 100644
--- a/misc-utils/lsfd.h
+++ b/misc-utils/lsfd.h
@@ -148,6 +148,7 @@ struct file {
 	unsigned int mnt_id;
 };
 
+#define is_opened_file(_f) ((_f)->association >= 0)
 #define is_association(_f, a)	((_f)->association < 0 && (_f)->association == -ASSOC_ ## a)
 
 struct file_class {