From nobody Thu Apr 2 05:56:59 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 B66043CBE69 for ; Mon, 30 Mar 2026 12:26:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774873575; cv=none; b=uP3NRU1Hcrd7BCzdalVuuuZ2HhkVBq8bPk0RFr+2Q5K2WvOzHbBR1QqPm5FXFFrEAE5NLRpjPvsWThOry/Y8ZvJ532W6lsKB20rfYvVI8tPcDwgW/NuyvoajMEFJ+qCAqVHRc0ILf7fgV1ZgocnId+OILOLCo6EAonz9qhkaXok= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774873575; c=relaxed/simple; bh=COKwH1VH8BuYCRynamMlTkaMzJ4AGwGGF/sBUjJNvDg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dZIi+POb/ikXkL0LiYgHMky27Nx1pD58/t2MqqdlDBnbFj/Icje+V3BrOAMP3Sc04CLByQ2SQ8tz5DI+sYxHvTVQZBgwTsST1KJkYM/ppUEi3zbH+UBiS/CheGYwCi4uVm0ULIXaMWrLmajpCck4PwpBWA0YAEtpajDs85FzKhY= 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=HSRcTdML; arc=none smtp.client-ip=209.85.128.42 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="HSRcTdML" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4852e9ca034so42378385e9.2 for ; Mon, 30 Mar 2026 05:26:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774873572; x=1775478372; 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=jBIfgeXR6ZzaVZZprJJKEW+34xpz6VJfBbaNi9NqWK8=; b=HSRcTdMLvmqF/ibNsUK6wJquEZjZLD8VZwhzYzeY5MDFT6UQjz6l30yjqkzumdTKnJ ANONMBfO5pTRTVsmXZa4Z3k2gSKX77XW4daTICfYLi0uznuEATOsEkNvHmC1HkYSiWii 7/aLUGmuYpxLaMXhMqjZ6jqeAQFiFapsTynbZfc3VNfr/FCd6J3r4H+Zl2cvaHsQDXXj R8jA/zaCyZHyhWm3cDBclSazdOgMf+HEnHcPR00LwhjWP4rUm6SnFO/QhxfquZz9jA/O RJfhDcWzfwdRvSK0lygWRsLApP9KvYDNIh6R3VYkNpIHSwok5q0wXlfVdR5jns7SXoQI mggA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774873572; x=1775478372; 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=jBIfgeXR6ZzaVZZprJJKEW+34xpz6VJfBbaNi9NqWK8=; b=q8uQ69SZRGZ+3abwyVXymz/p0ZNLckPjipZB+1tbrUxIcufNXhkUM4wL6ImcYj9WV1 RpC5yFa/PvPu5oNepW4cbbcFK5wIjcdVRISSfZkEaUUfdLwfoxNeGV7DX9mjqko8yo/Y NC/bBEz9AvyEqKktybwlh2WFkdy70X5LS0Gzv+q8M7wmUU4Hu1GJB+G45olb6VDs5TYP jnFZHqBEGzV1XnlNb7wDdvqRJKFySqjVG442HnQ21y/Y+zTrM8yMTNEkvhSGy/dqkS8G O6ZR5pBxixavr+rV6oCTZX1cw3uX4DTUxniQeEyJ/ubLJ/NDFBLtufZqvXBhHfi66ANc Kezw== X-Forwarded-Encrypted: i=1; AJvYcCXjTephDDEYjSqfjv9JduggwDbddbdsMDltfdPtU213FbP39NA2bb/+RuHHoRpYmsUSZaaItklb5i5h+PY=@vger.kernel.org X-Gm-Message-State: AOJu0YxsLJR1xMVTHQqi9D0mRJYP/rLgY69x+moXYfGUeJAjN1Zv2OVE S3l+pXQO66t/STSt1ztF6879CR+4lD1H6WVFZUWP0/0PQIh2ai25o6Vh X-Gm-Gg: ATEYQzwlCVSy1aAiKiameo0OLQ0LoOzq5b4JcuznVfaY5tYOdXoOeyX36fRGePyl3M3 How1WogyRxoj5Hj87y+W6oPE00DOjTOLQtv5uTood3e3anwMM331uJRR1dEXCjQNgHAAk0RhsFz i9qZ7/QjC23PYmOFY5hCetEuYLzwa8rAvH4hrYaZmFHgPgiZWqDZQQoaoe3PNCcJ1wfMnhsA0kY dpihLXOuAOmU54yiGzZ7b6eCg7A2QHF79Ivwp5cK4KcR+bUxW1u7vxMd7Hqpa1NPIU53+1gX1v9 xxNahVvxrH4kABk0+d8Kdo3laMm2uZbAP0ULlSReotl/T/J5PHKcvIGw6BeHgUOjL/YEXFGMK8I GzhSAp2R2FMinzKkYGW5S297nf3KCHSFiQ8HX9ch8sGf8YpKZE0qkqdC2Kk6BsvcGlN12a7aTLj /1k1j6V7+h6B763t9rlt/9vhQRbiO/lFIx814WzFHUNvUuOqSNaCGRBm3afVA7QBi3IQIiWiiLp A== X-Received: by 2002:a05:600c:3e88:b0:487:243f:dc3e with SMTP id 5b1f17b1804b1-48727ee98a2mr194363335e9.6.1774873571860; Mon, 30 Mar 2026 05:26:11 -0700 (PDT) Received: from f.. (cst-prg-89-171.cust.vodafone.cz. [46.135.89.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48725da0333sm113541525e9.2.2026.03.30.05.26.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2026 05:26:11 -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 v4 2/4] fs: relocate and tidy up ihold() Date: Mon, 30 Mar 2026 14:26:00 +0200 Message-ID: <20260330122602.3659417-3-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260330122602.3659417-1-mjguzik@gmail.com> References: <20260330122602.3659417-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..e397a4b56671 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_once(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