From nobody Thu Apr 2 12:13:03 2026 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.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 6778E3859FE for ; Sun, 29 Mar 2026 17:20:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774804822; cv=none; b=hGUWLgRWBbfSkMkdrt/6w5Z9QWbBoOGKmPfDiM2ZYUJNI4+n1ZyRYs26k5/3tYVuqN8DMS47FRlP8iWEtzKea4TZ1mjWbfSsV+xxsQwH9OWcag5ayIwZ4b8rNT0CdBYq+wA7Frxy3T1ocm2eqEIk8VS4ZXgybkQVguELmtsR8VM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774804822; c=relaxed/simple; bh=hYUpnp+Ac15RiBQCN2Hkk4rhsctI+fBGp2S/cJmDxI4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JKadtOq8sU+VF8sPTQUjhlz84yfhOfFV0rFPqVsck24sZtDoMi2tuhBFX9Oqvt7YwyKvumgHdqy5IR4lJRqXQ2Zc5FVolV7/Xcnh9l1nPXCbSAM+3PFknkE1DP0LwzGUnSwH6L6da2sgV7YswAItPmkRbXs1wNVHZPCyiUAIaDg= 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=raaOPlLd; arc=none smtp.client-ip=209.85.128.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="raaOPlLd" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-486ff3a0fc1so32765215e9.2 for ; Sun, 29 Mar 2026 10:20:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774804819; x=1775409619; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eeU9c3QhXSSwwCUTOdTttCtE5NyIfRbHvJK3GzoFu3E=; b=raaOPlLd7vgz+OjLQW6oZ0jdtNEMbgCwYLnrI7OfKCCphjK9CwMGbYz3Eq4ICqaIoK yDaQ7xpj1aF7NFaX+lURMG3wtu8rL0zLpyINXljp3uPfzeUSViA95Mz3xvNX8JKQ7wJJ WKttx3OE7rGuVXz6PD76uNqa8N0OOjHdepELVHsFuzb/p3W/qIvfecdPOqinOGSa4jyO D/O7ervLQBLdFtYZinKbw+11V2w0ROUGBqtzBRjVNf9R096VYAOWhQPfm8uatZBOssCu j5aUpOGgH+YAniM/cblICixkeiRx/9vboORBZNmMH7HEITFKdaDzi4xsy0sBHwoW1d47 WUYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774804819; x=1775409619; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eeU9c3QhXSSwwCUTOdTttCtE5NyIfRbHvJK3GzoFu3E=; b=Xw655uUFmtMt9CSMxgjpkTlYE51+l1N3hzeZ/6CvHMqKyKU0PnJeKdIPlYTW5ipe0v 8H34XAr0WQdqt5RQC6orB6xOw0y4QFp6xNkvy2k6s9IvblPkMIFAcIShMNn+BPOpRh/f 0LxxUUSp7zRIVfwpqR/QUC6BxOzMlIOyb6cLqUBg2syi6TKAgRdKZnZaYlfsro7ZGY+6 kSClpPJYI8/KLPASIVavS7TUO/lKKH/KFRKEjU9BCbkw5M23HEDKx/DSRu0wiCDJFeBz c8YyrX48sI6obcuL3GZvLc2t/aonqSQTeXTupi2PpbatPYBIWd8WijrinvYEf26BK9qd bF/g== X-Forwarded-Encrypted: i=1; AJvYcCUidrgxVy1wxN/KQMznYma4U+YpmQneRYgAzuWSItsO6A0xL6MCJXVQHlsjrHpGZGNDkYnU2adkcZ3nYqo=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1S7CvwQ5OWZTB+a7zZ8O7iA1/QhFiW+Eae4udf5zTj67q0zF7 WRdQ2hpQyAS3i+ISlIL7wcGM4HMqxhTJdzXVVTW0nkC8MMrA/pe1S7zo X-Gm-Gg: ATEYQzyGL7I+5Ee06zT2Z+iG6QVhXESIloAc7MRIJzGTcw2cl9CPTxYKUMs18T7OqHA +eJSMZeHUTcHo+xF3tRBeicGVqeovJKTh026+1bDZpwSPDO2o8JLbyjIOtITchtjsZb5P81WWpa aJ3dj/vNWdx/Aa2dZjcc8ayUfUdZ6woGUZYj1aOT/IqSnigoxQJM1wsdNrk9qbVc2WSBzZPO5Qh BRcoQtna58RGPUgVeNd/SuWmHycxKM0usRoSBGAfpqXjeQDfQCtxgpWaWlIhJDVwQjSoIkQwQCp mVWAP2kxzlHJwZZ19veI4idxlBeSCC8rYi99TDtc9oE62RMAXJ/2M1ku9YWYGySAzTkgymWpODG 1EUmFQtmAnYFPcjd2pkHYdt53ePbHMZ2TsnnLZ2Pbx3lZAHWAZ+mvfEYW6Y8c3zyN3KXe2amg0U VFJJUidZw2UOrKmZEM8Uyp/d6kO07MR6TVxcVNRsVdGpmviUC6PoDkX476Uol1XegL1IxSuXN/H w== X-Received: by 2002:a05:600c:6287:b0:485:469f:5320 with SMTP id 5b1f17b1804b1-48727ef6865mr171642215e9.30.1774804818460; Sun, 29 Mar 2026 10:20:18 -0700 (PDT) Received: from f.. (cst-prg-89-171.cust.vodafone.cz. [46.135.89.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4873cd7d039sm9776805e9.15.2026.03.29.10.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2026 10:20:17 -0700 (PDT) From: Mateusz Guzik To: brauner@kernel.org Cc: viro@zeniv.linux.org.uk, jack@suse.cz, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Mateusz Guzik Subject: [PATCH v3 4/7] fs: relocate and tidy up ihold() Date: Sun, 29 Mar 2026 19:19:59 +0200 Message-ID: <20260329172002.3557801-5-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260329172002.3557801-1-mjguzik@gmail.com> References: <20260329172002.3557801-1-mjguzik@gmail.com> 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 Content-Type: text/plain; charset="utf-8" The placement was illogical, move it next to igrab(). Take this opportunity to add docs and an assert on the refcount. While its modification remains gated with a WARN_ON, the new assert will also dump the inode state which might aid debugging. No functional changes. Signed-off-by: Mateusz Guzik --- fs/inode.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 1f5a383ccf27..0050eca6d83f 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -522,15 +522,6 @@ static void init_once(void *foo) inode_init_once(inode); } =20 -/* - * get additional reference to inode; caller must already hold one. - */ -void ihold(struct inode *inode) -{ - WARN_ON(atomic_inc_return(&inode->i_count) < 2); -} -EXPORT_SYMBOL(ihold); - struct wait_queue_head *inode_bit_waitqueue(struct wait_bit_queue_entry *w= qe, struct inode *inode, u32 bit) { @@ -1578,6 +1569,17 @@ ino_t iunique(struct super_block *sb, ino_t max_rese= rved) } EXPORT_SYMBOL(iunique); =20 +/** + * ihold - get a reference on the inode provided you already have one + * @inode: inode to operate on + */ +void ihold(struct inode *inode) +{ + VFS_BUG_ON_INODE(icount_read(inode) < 1, inode); + WARN_ON(atomic_inc_return(&inode->i_count) < 2); +} +EXPORT_SYMBOL(ihold); + struct inode *igrab(struct inode *inode) { spin_lock(&inode->i_lock); --=20 2.48.1