Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Yangtao Li <frank.li@vivo.com>
To:     Jan Kara <jack@suse.com>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-kernel@vger.kernel.org
Subject: [PATCH] quota: remove PRINT_QUOTA_WARNING support
Date:   Thu, 13 Apr 2023 22:45:57 +0800
Message-Id: <20230413144557.20700-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AMGwoyW7rYH9kibcaxCnb4/XzcqKx7gXEHOBzMYadMnHtJi9uRhkBVytl9KG?=
 =?us-ascii?Q?K/+hdNBprRwgsdfLefd390Fu11JyVU79VbPRrq/WaqJd/xTEk303au35PD9M?=
 =?us-ascii?Q?GzcxfdGGLgLk4choKQerGh1sDSSIQcZxA/qQ2PXIRrTasn8aRBOFO6VSdmiA?=
 =?us-ascii?Q?TiFoH9bVP3t5j30kKubzNwGTCtxp4D3bu4YSgWIoC5J/Gx/s64LslQTBe+mX?=
 =?us-ascii?Q?3xfs3YHad5Pd4EDKdkOVyZ8NtaDvtl1ovN42TVEIWe+rLv5gn2dgPkJ6VauE?=
 =?us-ascii?Q?0ALWEJLlRC9nshAmBrjMnilYvSpaKa3//R5evsXOlHOqP7FV1YkjZzBrYDe/?=
 =?us-ascii?Q?yrIXZciYgfVVE0J3Vhz+spHIJjF5ghJoYqBtknQQxUSIYnoIHn95fJXobSn5?=
 =?us-ascii?Q?wxBtnjQn9OHoD35GaMZoZoN/iZcoMcl3Plz/IKbSrnkTbXyaDRwt9fLSaT4E?=
 =?us-ascii?Q?yNDiDEHA19fNZM2nLj4xBWccMr8rUyCQhlgB5kmfRMo8qricY+ygY1Ho30Fm?=
 =?us-ascii?Q?XbXn8rxBTR3eeyiX2usZR91LKCP9tI9XJfFxhNaUGXBcg49MUVQIaBCYkw/Y?=
 =?us-ascii?Q?1AqzHtuuV85gjFYwiqwv4jjiHQTRy7nTST3i9s0hEQ67xvC8CHlkzydLeawj?=
 =?us-ascii?Q?/k4c67oRqtIFE+Qwa5XA5/AG6PWxk2Xked8ym1vB4WItHSxK/rjhbinjN0J4?=
 =?us-ascii?Q?9Z/WHiNcfIfW446RIqTHCTbz/PYHVEKn9ZIKrbwFr3qO8gmpmC5Aor40m2b5?=
 =?us-ascii?Q?7GWC5n3K9JDGmHUySNCcubZXM5iQ6bAj6TyPjNYyggVrR+oIE4HHbUf8jg4V?=
 =?us-ascii?Q?YJFrAx7zeslv0rD/sYrZWefojtFVw48F1yb8Ek9P3iimi8DCZFt0t3kbuJOh?=
 =?us-ascii?Q?7Mbtd8+jsN7L3nS1g+8iGnU7DezvbI43qxxo0JySLdKaMZnvl/cI8cUIEwYZ?=
 =?us-ascii?Q?h1alekTTSedGHc8tzq58ejmeUf18O35x6GsD5PhbYviCy6HOW4WmVJYJLWVH?=
 =?us-ascii?Q?7XJ8bynlkSVAu0Pw36wKYLyGgKsWhP5ycGZLyedO2kPYsc9MqB3t8FZehSpi?=
 =?us-ascii?Q?CAx3sem/n7dH3LF46sfhClGf9jzq2dKm9XWenrH9fKNdvyAWaTB8veneB1eX?=
 =?us-ascii?Q?m07jAdOq5rdSIJxUvnjGG3+RTMfdWyiIen5ufTG0hwXwhuGH++x6Fuisavp+?=
 =?us-ascii?Q?zuyaa3+pCvJsgmLlp6j9GayRkgkbLpiu0nBW2UhINVMW8cjbNOAjMKH8VIFP?=
 =?us-ascii?Q?2R4tzmjjGjVeDNgQRYL2CKIpR+zHi/pCSRK2OXDozrJtHUqhVBCVUQ21fSqe?=
 =?us-ascii?Q?85HmOJ91SZVCjyIfwtroZZQ5PBLgjaRr3rdUh5dIs8Nx/UMczmyxp3jLLOSa?=
 =?us-ascii?Q?Q7qM1NB0CezZWE4tGxi+QgxX7frC7Niv4cZoL1k5UJag9iIrg32NIxha/9p8?=
 =?us-ascii?Q?GA2p17shABLyTESPPry1hNRD7aRhfEO82Nm+LOHYQerHBc2tyAf/gpCZ0QqP?=
 =?us-ascii?Q?fVwb6ze84uJr08HZwcBY7aCQ+8fvkxqZiG00qpZ00uMhpZkB9REzjMBUye7W?=
 =?us-ascii?Q?rHd9HkwZSHjkBcFTAcs209ZSHVliZh6Sn1s0IIVE?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fa75566b-f17a-433f-78c3-08db3c2dd128
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2023 14:46:08.4750
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6OKRGooNYca2cGmSvxCsKSVPdchlgq3MiBo58HNBH1GBZEAfN18aDV7/bGmJtDeDG/NULG30vaMgA3BIq8FDHw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PUZPR06MB6067
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

It's deprecated since commit 8e8934695dfd ("quota: send messages
via netlink"), so let's remove it. User should use notification via
netlink socket instead.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/quota/Kconfig | 10 ------
 fs/quota/dquot.c | 80 +-----------------------------------------------
 2 files changed, 1 insertion(+), 89 deletions(-)

diff --git a/fs/quota/Kconfig b/fs/quota/Kconfig
index d5a85a8062d0..1b3bc0a99515 100644
--- a/fs/quota/Kconfig
+++ b/fs/quota/Kconfig
@@ -26,16 +26,6 @@ config QUOTA_NETLINK_INTERFACE
 	  hardlimit, etc.) will be reported through netlink interface. If unsure,
 	  say Y.
 
-config PRINT_QUOTA_WARNING
-	bool "Print quota warnings to console (OBSOLETE)"
-	depends on QUOTA
-	default y
-	help
-	  If you say Y here, quota warnings (about exceeding softlimit, reaching
-	  hardlimit, etc.) will be printed to the process' controlling terminal.
-	  Note that this behavior is currently deprecated and may go away in
-	  future. Please use notification via netlink socket instead.
-
 config QUOTA_DEBUG
 	bool "Additional quota sanity checks"
 	depends on QUOTA
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index a6357f728034..10b46c403bdb 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -154,7 +154,7 @@ void __quota_error(struct super_block *sb, const char *func,
 }
 EXPORT_SYMBOL(__quota_error);
 
-#if defined(CONFIG_QUOTA_DEBUG) || defined(CONFIG_PRINT_QUOTA_WARNING)
+#if defined(CONFIG_QUOTA_DEBUG)
 static char *quotatypes[] = INITQFNAMES;
 #endif
 static struct quota_format_type *quota_formats;	/* List of registered formats */
@@ -1171,72 +1171,6 @@ static int warning_issued(struct dquot *dquot, const int warntype)
 	return test_and_set_bit(flag, &dquot->dq_flags);
 }
 
-#ifdef CONFIG_PRINT_QUOTA_WARNING
-static int flag_print_warnings = 1;
-
-static int need_print_warning(struct dquot_warn *warn)
-{
-	if (!flag_print_warnings)
-		return 0;
-
-	switch (warn->w_dq_id.type) {
-		case USRQUOTA:
-			return uid_eq(current_fsuid(), warn->w_dq_id.uid);
-		case GRPQUOTA:
-			return in_group_p(warn->w_dq_id.gid);
-		case PRJQUOTA:
-			return 1;
-	}
-	return 0;
-}
-
-/* Print warning to user which exceeded quota */
-static void print_warning(struct dquot_warn *warn)
-{
-	char *msg = NULL;
-	struct tty_struct *tty;
-	int warntype = warn->w_type;
-
-	if (warntype == QUOTA_NL_IHARDBELOW ||
-	    warntype == QUOTA_NL_ISOFTBELOW ||
-	    warntype == QUOTA_NL_BHARDBELOW ||
-	    warntype == QUOTA_NL_BSOFTBELOW || !need_print_warning(warn))
-		return;
-
-	tty = get_current_tty();
-	if (!tty)
-		return;
-	tty_write_message(tty, warn->w_sb->s_id);
-	if (warntype == QUOTA_NL_ISOFTWARN || warntype == QUOTA_NL_BSOFTWARN)
-		tty_write_message(tty, ": warning, ");
-	else
-		tty_write_message(tty, ": write failed, ");
-	tty_write_message(tty, quotatypes[warn->w_dq_id.type]);
-	switch (warntype) {
-		case QUOTA_NL_IHARDWARN:
-			msg = " file limit reached.\r\n";
-			break;
-		case QUOTA_NL_ISOFTLONGWARN:
-			msg = " file quota exceeded too long.\r\n";
-			break;
-		case QUOTA_NL_ISOFTWARN:
-			msg = " file quota exceeded.\r\n";
-			break;
-		case QUOTA_NL_BHARDWARN:
-			msg = " block limit reached.\r\n";
-			break;
-		case QUOTA_NL_BSOFTLONGWARN:
-			msg = " block quota exceeded too long.\r\n";
-			break;
-		case QUOTA_NL_BSOFTWARN:
-			msg = " block quota exceeded.\r\n";
-			break;
-	}
-	tty_write_message(tty, msg);
-	tty_kref_put(tty);
-}
-#endif
-
 static void prepare_warning(struct dquot_warn *warn, struct dquot *dquot,
 			    int warntype)
 {
@@ -1259,9 +1193,6 @@ static void flush_warnings(struct dquot_warn *warn)
 	for (i = 0; i < MAXQUOTAS; i++) {
 		if (warn[i].w_type == QUOTA_NL_NOWARN)
 			continue;
-#ifdef CONFIG_PRINT_QUOTA_WARNING
-		print_warning(&warn[i]);
-#endif
 		quota_send_warning(warn[i].w_dq_id,
 				   warn[i].w_sb->s_dev, warn[i].w_type);
 	}
@@ -2936,15 +2867,6 @@ static struct ctl_table fs_dqstats_table[] = {
 		.mode		= 0444,
 		.proc_handler	= do_proc_dqstats,
 	},
-#ifdef CONFIG_PRINT_QUOTA_WARNING
-	{
-		.procname	= "warnings",
-		.data		= &flag_print_warnings,
-		.maxlen		= sizeof(int),
-		.mode		= 0644,
-		.proc_handler	= proc_dointvec,
-	},
-#endif
 	{ },
 };
 
-- 
2.35.1