From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B242433EB1A for ; Sat, 11 Jul 2026 06:38:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783751910; cv=none; b=S5jFiXL+anI4x4nee8/ivuAaHsoBYJr5QrRJd18j+Uts7vxl8r7cw14gXrD0vWAkX/ipYeC3ZNqnJdEXpKwwgOMFXtkLrx0mTfLcliZ4L3rUoJTNWgt/1EiiQJl8JMHXoIK17gr0zyRy018+Kc6ianXsoXCMXgeZ0eDQX5dM4lQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783751910; c=relaxed/simple; bh=dWWAMJSMfGrLurlCO2n/jTCqsh5B1l9WE2bnm0I5Roc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=UfVRCwpGx/Uzk9tLWQ6lpxeaubA+MbcGbmAh3uNSGH+ctuwVnxWJQnf4wVuiGo4W2tzamAPgR9oAdbfcFxvmSilY/hzvGqYl6zQHODSBKd2TVaQnDc2M+mO/w3G/SCLWRaeCpZvTuH4DiHLyTRGEM0ISmR3eilktz7fCnvO+dok= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=f3ykabJo; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="f3ykabJo" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-4720d22c94aso1385734f8f.1 for ; Fri, 10 Jul 2026 23:38:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783751907; x=1784356707; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=/s+2rX7eEUkFVusG/7aG24rqZbgQVdZ6GO/PTTSZUO0=; b=f3ykabJoCg30VJgvb0yCbuxi1OZl1JJioLG/WRQarXjpIONGv449ncNhzMdRq/mGsM Uvy+D0rlbSRBIPEwQo6fH8/HJ7Us4DQHbbG2dtg6Y1cgpAJmIA/efTz7LVbS/rGRL0Tv hzx59wzpT9DAcZGgTykUOnPQXpKz17/WgVL/uTjcjZ3bkUmKvsXaCXOH9DGORpsOFxG6 BmZUElA9kkQOtfhjcDV07LbyvbvxKjaqXzR8dPoCu2d7b/NV4cM5BHxcA5PwtkoYZNTT tlCRQbx5qTvN7IR8kSua7XGCncxyfOT6PDRIdIVJIrcZCJZDTi3pk6npcEvVXw4dhmDX 17Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783751907; x=1784356707; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=/s+2rX7eEUkFVusG/7aG24rqZbgQVdZ6GO/PTTSZUO0=; b=fP5AUqv44tXrZjZjIa3mrzoUmnZvKrC3UMzAWjJz/WQRAN4IgjLmNJJ2yJZUgn0LO1 x5e70dH0Czz9d3Ne4Ptf1fC2fi/W6ZO3UmkLajJiiwnNIMs7kqwKCLkiQMlNu46+QQnt FC+HRpPGqJq3WBiXQUKfr+/sqZMYRQT9/XdHaddBSFANI6NvsthB1mdXhbH3EHOME6hK IIvVI/VRoYpl4X66SaE4goUpzcM7yCxcGrS45z4xTr8ZkE/b6p2vJbe8+Ug+q5HO04BO INKEZUlztouovTCXMBui31J9Wb/hflMNuoGVyxCcvkImFGxxzA7N+cAbYxCgQ3aLx6uz OFwA== X-Forwarded-Encrypted: i=1; AHgh+RqnIpJeqq47hffbhO3F7SuZ11j44m2N6fLJBgfgNFzwQhT4uHZLqVlYvezEPYzkrlHIzulA/gKU1gyrpZE=@vger.kernel.org X-Gm-Message-State: AOJu0YxFXE2SiOLY8WQAgpO3myycxATNTWsgTeQy+1k6FxeSxgKwzwuL uT/N4ZmkZOz1A2tUH24rLLYebd1t7M5noW4eTityMnyi7Sr4aMbH0WnD X-Gm-Gg: AfdE7clvv8s7eibk6kXwj5lEqhsT4dW8pTq+Dosm61qTeQePL0nEEPx2+wcP5QjuYP+ AknMocpu/iogu/rpRgBA6i/TyX5oSweEPQmZj1k/riNXEGZzL1e1MkzBzwTbT7qT2D0GPCDcMYX 6EDuwtgLcfEO+XxB5bfMbrxTu117fa1SEbBfApaguODx76dYHE5Br4oUPmXkSmPOLA19jNWaCW7 3uVQ7tUXLzAVVgGRDrsF5gPB2mpJ8+JEy+jrQBuHsbSXMtc62MxdyfYTdieczF0HcUYEqV+XOVp 4FOGcwyejet4GODbABcoHtCkfN+fuEE6cfpCPEFA7m5BBGd6L+D1x9ILmJLhu0iee0KfLqdYp6D a5dvI7X7XVGPxc5ZyNkLJJmcSj8JmhM/Li5Dy8NfHzPHRCI704Qw/gf6tjWdjvV9k3Kcjn3v065 26vRLR4MLjQuD4GoapAh0VCAg2etJMaD6JbjDeFzWT3zI370PkCKLw3QSHttqsFeYEneCwNa+uD h46FZLgVA2PyrFcDJJ50caIfVVwn41JfaKjYn7TKwAldNY81FeltPOonvSi30obogyr1QcKRHQ9 nmVZteWq4n6YAn2f0R02+OH6oz8UjrnfJkh4noVbzhnisocFfz0v0w== X-Received: by 2002:a05:6000:26c7:b0:46d:55a5:8ec5 with SMTP id ffacd0b85a97d-47f2dcf9e3emr1466458f8f.33.1783751907045; Fri, 10 Jul 2026 23:38:27 -0700 (PDT) Received: from [192.168.1.187] ([2a02:8308:4092:11f0::f9f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47a9de1e736sm70744243f8f.7.2026.07.10.23.38.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2026 23:38:26 -0700 (PDT) From: Joshua Crofts Date: Sat, 11 Jul 2026 08:38:18 +0200 Subject: [PATCH] ext4: use str_plural() instead of custom macro Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260711-remove-plural-macro-v1-1-b3dcd44e4068@gmail.com> X-B4-Tracking: v=1; b=H4sIAAAAAAAC/x3MQQqDMBBG4avIrDuQuGjaXkVcDPGPDkQjEyqCe PeGLr/FexdVmKLSp7vIcGjVsjX4R0dxkW0G69RMveufLnjPhrUc4D1/TTKvEq1wQEzyCu8UBdT K3ZD0/F+H8b5/3i6w9mUAAAA= X-Change-ID: 20260711-remove-plural-macro-7ecfa879fcae To: Theodore Ts'o , Andreas Dilger , Baokun Li , Jan Kara , Ojaswin Mujoo , "Ritesh Harjani (IBM)" , Zhang Yi Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, Joshua Crofts X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1783751906; l=1303; i=joshua.crofts1@gmail.com; s=20260530; h=from:subject:message-id; bh=dWWAMJSMfGrLurlCO2n/jTCqsh5B1l9WE2bnm0I5Roc=; b=lmuVrHFGc/gjExIXjwRFMNDC8aAsJm6goNGOpZnR7co1i4kdwNxQZLrsUIVxkUNcL+xVweE1E leVj2NQNZ19BjuCP2jSpN0sCTRcAnYrtDZhI4Wjp1BIci7Y4eX4oh+8 X-Developer-Key: i=joshua.crofts1@gmail.com; a=ed25519; pk=RTDOoVwgeL4oFdASj9U+cxJuIjXuXk73zkjnGOJKbEo= Remove the custom PLURAL() macro and use str_plural() from string_choices.h instead. Signed-off-by: Joshua Crofts --- fs/ext4/orphan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ext4/orphan.c b/fs/ext4/orphan.c index 64ea47624233..e307d6d55451 100644 --- a/fs/ext4/orphan.c +++ b/fs/ext4/orphan.c @@ -4,6 +4,7 @@ #include #include #include +#include #include "ext4.h" #include "ext4_jbd2.h" @@ -486,14 +487,13 @@ void ext4_orphan_cleanup(struct super_block *sb, struct ext4_super_block *es) } } -#define PLURAL(x) (x), ((x) == 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) { --- base-commit: c143957520c6c9b5cd72e0de8b52b814f0c576fe change-id: 20260711-remove-plural-macro-7ecfa879fcae Best regards, -- Kind regards CJD