From: Masatake YAMATO <yamato@redhat.com>
Date: Sun, 12 Nov 2023 18:03:03 +0000 (+0900)
Subject: lslocks: (refactor) remove 'pid' global variable
X-Git-Tag: v2.40-rc1~163^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8199879e48f223254898bb4ec08d8042a99a7148;p=thirdparty%2Futil-linux.git

lslocks: (refactor) remove 'pid' global variable

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

diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index b3f0664350..0c6de0dd57 100644
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -89,8 +89,6 @@ static struct colinfo infos[] = {
 static int columns[ARRAY_SIZE(infos) * 2];
 static size_t ncolumns;
 
-static pid_t pid = 0;
-
 static struct libmnt_table *tab;		/* /proc/self/mountinfo */
 
 /* basic output flags */
@@ -464,7 +462,7 @@ static void add_scols_line(struct libscols_table *table, struct lock *l, struct
 	}
 }
 
-static int show_locks(struct list_head *locks)
+static int show_locks(struct list_head *locks, pid_t target_pid)
 {
 	int rc = 0;
 	size_t i;
@@ -520,7 +518,7 @@ static int show_locks(struct list_head *locks)
 	list_for_each(p, locks) {
 		struct lock *l = list_entry(p, struct lock, locks);
 
-		if (pid && pid != l->pid)
+		if (target_pid && target_pid != l->pid)
 			continue;
 
 		add_scols_line(table, l, locks);
@@ -603,6 +601,8 @@ int main(int argc, char *argv[])
 		{ 0 }
 	};
 	int excl_st[ARRAY_SIZE(excl)] = UL_EXCL_STATUS_INIT;
+	pid_t target_pid = 0;
+
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
@@ -624,7 +624,7 @@ int main(int argc, char *argv[])
 			json = 1;
 			break;
 		case 'p':
-			pid = strtos32_or_err(optarg, _("invalid PID argument"));
+			target_pid = strtos32_or_err(optarg, _("invalid PID argument"));
 			break;
 		case 'o':
 			outarg = optarg;
@@ -676,7 +676,7 @@ int main(int argc, char *argv[])
 	rc = get_local_locks(&locks);
 
 	if (!rc && !list_empty(&locks))
-		rc = show_locks(&locks);
+		rc = show_locks(&locks, target_pid);
 
 	mnt_unref_table(tab);
 	return rc;