From nobody Sun Dec 14 13:53:06 2025 Received: from out-184.mta1.migadu.com (out-184.mta1.migadu.com [95.215.58.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C568214816 for ; Tue, 4 Feb 2025 15:57:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738684650; cv=none; b=E6VJ2XxsEUMS38I3ut2La2nsme03DFBS4stagZ11F/IfVruVZeVZT84YIFmwxckbyU5j29lwltCyJ0mh8V0wG+abGRqpsx4oPRxsQGPJRYVQoNT3BtixpptV7g0lE4eufareCguKp52dqU6tFe0JcDJ6BuYxaPlNE8iASISyhOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738684650; c=relaxed/simple; bh=nNZkV5dZvnerrrabYupYnm0jtaQhOWqqF15cD5rwh8Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=MSDi3Wubz/iSyg+NrPi9biAeN984ez1kfxsqXR8cJ+TvIRfnM1SpkNrybjpnCQHWI0QDHo6mahjI9awVMeYkYXhY099FnNFW95OfU7QWWzGreIR5fLRrXTIExZrhFY9EWMKELykhRTUcHwM9+LSMFBEX8/ZqvVyjwT5ETJ+aYcA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=XkoAQK+f; arc=none smtp.client-ip=95.215.58.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="XkoAQK+f" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1738684645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=2N9dh/hrAxDhAxb7Cx6jXTYkCHM0vnY3TInVj0O++lA=; b=XkoAQK+fTH7UaoR/Rqp24EJH3mOkziyHZw0Aswt8w5l3OCcX1pe/WS3yRr7/VRvxIwQ2z7 z0b7wKqb5fN5bAB3bA13n7nOzRoXBm6NQQaBzjdToZsWeJqMtKb+vRynu+jDdQQVhbPFw9 4O4uoFMWFUzMRGh4g9G8nmw8T4q0/T4= From: Thorsten Blum To: "Theodore Ts'o" , Andreas Dilger Cc: Thorsten Blum , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH] ext4: Use str_plural() instead of PLURAL() macro Date: Tue, 4 Feb 2025 16:57:08 +0100 Message-ID: <20250204155707.4669-2-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Remove the custom PLURAL() macro and use the str_plural() function instead. Signed-off-by: Thorsten Blum --- fs/ext4/orphan.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/ext4/orphan.c b/fs/ext4/orphan.c index e5b47dda3317..1320f91c9b3b 100644 --- a/fs/ext4/orphan.c +++ b/fs/ext4/orphan.c @@ -4,6 +4,7 @@ #include #include #include +#include =20 #include "ext4.h" #include "ext4_jbd2.h" @@ -488,14 +489,12 @@ void ext4_orphan_cleanup(struct super_block *sb, stru= ct ext4_super_block *es) } } =20 -#define PLURAL(x) (x), ((x) =3D=3D 1) ? "" : "s" - if (nr_orphans) ext4_msg(sb, KERN_INFO, "%d orphan inode%s deleted", - PLURAL(nr_orphans)); + nr_orphans, str_plural(nr_orphans)); if (nr_truncates) ext4_msg(sb, KERN_INFO, "%d truncate%s cleaned up", - PLURAL(nr_truncates)); + nr_truncates, str_plural(nr_truncates)); #ifdef CONFIG_QUOTA /* Turn off quotas if they were enabled for orphan cleanup */ if (quota_update) { --=20 2.48.1