From: JP Abgrall <jpa@google.com>
Date: Tue, 20 Sep 2011 21:23:39 +0000 (-0700)
Subject: netfilter: xt_qtaguid: change WARN_ONCE into pr_warn_once
X-Git-Tag: firefly_0821_release~7613^2~295
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7007813a1218c14a33869847a39e20907a48015b;p=firefly-linux-kernel-4.4.55.git

netfilter: xt_qtaguid: change WARN_ONCE into pr_warn_once

Make the warning less scary.

Change-Id: I0276c5413e37ec991f24db57aeb90333fb1b5a65
Signed-off-by: JP Abgrall <jpa@google.com>
---

diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c
index 9b9b809b9960..c42e486c5cbe 100644
--- a/net/netfilter/xt_qtaguid.c
+++ b/net/netfilter/xt_qtaguid.c
@@ -2113,14 +2113,16 @@ static int ctrl_cmd_tag(const char *input)
 		 * At first, we want to catch user-space code that is not
 		 * opening the /dev/xt_qtaguid.
 		 */
-		WARN_ONCE(IS_ERR_OR_NULL(pqd_entry),
-			  "qtaguid: User space forgot to open /dev/xt_qtaguid? "
-			  "pid=%u tgid=%u uid=%u\n",
-			  current->pid, current->tgid, current_fsuid());
-		if (!IS_ERR_OR_NULL(pqd_entry)) {
+		if (IS_ERR_OR_NULL(pqd_entry))
+			pr_warn_once(
+				"qtaguid: %s(): "
+				"User space forgot to open /dev/xt_qtaguid? "
+				"pid=%u tgid=%u uid=%u\n", __func__,
+				current->pid, current->tgid,
+				current_fsuid());
+		else
 			list_add(&sock_tag_entry->list,
 				 &pqd_entry->sock_tag_list);
-		}
 		spin_unlock_bh(&uid_tag_data_tree_lock);
 
 		sock_tag_tree_insert(sock_tag_entry, &sock_tag_tree);
@@ -2200,11 +2202,12 @@ static int ctrl_cmd_untag(const char *input)
 	 * At first, we want to catch user-space code that is not
 	 * opening the /dev/xt_qtaguid.
 	 */
-	WARN_ONCE(IS_ERR_OR_NULL(pqd_entry),
-		  "qtaguid: User space forgot to open /dev/xt_qtaguid? "
-		  "pid=%u tgid=%u uid=%u\n",
-		  current->pid, current->tgid, current_fsuid());
-	if (!IS_ERR_OR_NULL(pqd_entry))
+	if (IS_ERR_OR_NULL(pqd_entry))
+		pr_warn_once("qtaguid: %s(): "
+			     "User space forgot to open /dev/xt_qtaguid? "
+			     "pid=%u tgid=%u uid=%u\n", __func__,
+			     current->pid, current->tgid, current_fsuid());
+	else
 		list_del(&sock_tag_entry->list);
 	spin_unlock_bh(&uid_tag_data_tree_lock);
 	/*