From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 A50F6371D07 for ; Tue, 21 Apr 2026 18:26:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776795975; cv=none; b=pgxtbat7W07V8bzsQhQZJI5VFqTZ1j0oDsCBgLwZjwiRZdTsl5YtAJufj5YyYLFr5TkUhTDNrpyT3DqPKH828Xi+08t/L4AunXnhMdLx+lD3109GNAeZML9WMrmgBIHBgNRR+Ot9pi1eBlQByJ9PLGSgSdzehRR6pnRkHdUWo8A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776795975; c=relaxed/simple; bh=z5eXgCfkQiBbuzBvjsC/+er1CqGE0uZNle1S/+mRCoY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rUSAFUbExL+V70ZxwqBjTe61Y0Z0luW0jBi/R46+60nWkPCXvtLqd+pRn98NqfeJ2RBVgsmCbZTHTwLDYIcLbn3N5vOT4Q4VV5cHRPPANanIx3XcXAT+q2N1aP7wTBX7c+cUMu/m208qNJ+6of9fNUiEwjvndOO8h/qSKr5PJb4= 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=tGV+7Jwk; arc=none smtp.client-ip=209.85.221.51 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="tGV+7Jwk" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-43cf8d550bdso4089327f8f.0 for ; Tue, 21 Apr 2026 11:26:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776795957; x=1777400757; 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=YnjJZ3XipIhaoF0C2hZTVVvUz0isi+klnbzN+QxytNU=; b=tGV+7JwkO2D3t9YbIUzZFc5MMo1JpjpRyjQjwh3TplvH+LRdLPDOOy+18FX2wtltAm 7b1PVG2jPwql/KJUP3IDCF3gXqssoZMumhw28VkbulIauuJw9v4xXEGx9RMXNOs6bcZm /NYCQnTEZKTXbJYUhppr67PvIwWjT6KEvQ3/CmyyiE1gyY6lot6m7P9u7RXER+WQMW0z fo6v3s4rv2sukkq9kiRDZ0bbikdkSvTaJsaOUcrAX3+hWZ+xM2TBT5DxaZH+6t4hpXN0 Be5LhmZHjgzq5d4QEZMnkDkaTVsPNmltCwKxMKf/1KMCORzFd0kBfI7Dz3d1e4KTG96C YENA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776795957; x=1777400757; 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=YnjJZ3XipIhaoF0C2hZTVVvUz0isi+klnbzN+QxytNU=; b=FSEnuwFGWNSLZaEmbGqCYzLVfwtzp+k/S+l3L0KGH28Yn0NyztczoX6bPVLnZYu7G0 zsNTaisTJ9qq6YthVXHoXwM7YIsVInSIt/x+nieaMoXnoSOiKBCxdl4iZ2kgGtg0MbkE 2cdGr7I0pKRCuqFSzcAAdk5KoeCQfa71Rgd5QOdq2QgGWxzmm0Bm9l1DjNrdJ2hiQG15 NCwxKyazmMIcPW2onyD1ZML+tdm3D/KMVDDjchSFtUJV3GkiUd4MyioryMej8hP9xD+/ 19v2r2K3zUTdSh0kwMaUd3gqnslj0hssD6V/ltsOdWVhOTCn7crF78hiVs2M4B8ceYwm 5Vlg== X-Forwarded-Encrypted: i=1; AFNElJ99BPzzv6re+vTOu6Nn6zP9m7hkmzypibUkNi1zqKH2ebqB490PThD5T2ebB4v98zxTjO5P81PtRsmegA8=@vger.kernel.org X-Gm-Message-State: AOJu0Yyuryczmgh3nLysRZooS6y8uFmB8xwETghZgFoxBKGyqCNrzEnW bFejAn6vfcNS10rz+8lE4qZmanBbP5TctIR+rzrU+Tv6Okw3mX+GWjiD X-Gm-Gg: AeBDievrKTB4U0EA7fOOfo1RqCbi/BjJqyn5G3LIykRQBednSKgMJFKffrpFNZdnrpB kS9G9KfzEHl08w+TxL8RBBfblzMRLbVxyk81SWre9ZETk07ZVhJwlQTc9EkYPCNGNza+n8yAtEo 8LGemLOOych68bjXeu31wIo86+l9i5tVhfoXcUWvdPvdFP8gLS3pBHs56W9a9UVglDuXq1llf4K eXGUlH4NYUJWirs6ZDq1aa3PUHEVfHaNqbQQ/KjTCXV93oMfw/BRYYsQl5jAJhzB6XW4xDnXaAj BEMrYbqSom/LUIa/efG2b84aRgrLHRiaz2dhjrHUI6thec3TJS5yN7pQQl0pUyRwiGPPI74w47R jMcRZ307/vO/0HmaKAqJsq+mAhypZYu+/oIcNqRLIpkMGhSP6iV15P6tExP/dmjF4Zjva6QlRLJ LjCPFibb2vJ2F6AqmGSd4ikK8jvrU11p9n8L8kwifMTWrmJ8HI6LcoFehtZd6PWdSrorjfb5xx4 ag+LWMB6w== X-Received: by 2002:a05:6000:24c3:b0:43d:dd:8ca4 with SMTP id ffacd0b85a97d-43fe3dd33d4mr30768726f8f.14.1776795956948; Tue, 21 Apr 2026 11:25:56 -0700 (PDT) Received: from f.. (cst-prg-4-152.cust.vodafone.cz. [46.135.4.152]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43fe4cb1405sm38694053f8f.4.2026.04.21.11.25.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2026 11:25:56 -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 v6 2/3] fs: relocate and tidy up ihold() Date: Tue, 21 Apr 2026 20:25:37 +0200 Message-ID: <20260421182538.1215894-3-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260421182538.1215894-1-mjguzik@gmail.com> References: <20260421182538.1215894-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: 8bit 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 e57873136093..17f0804b429c 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -518,15 +518,6 @@ static void init_once(void *foo) inode_init_once(inode); } -/* - * 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 *wqe, struct inode *inode, u32 bit) { @@ -1572,6 +1563,17 @@ ino_t iunique(struct super_block *sb, ino_t max_reserved) } EXPORT_SYMBOL(iunique); +/** + * 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); -- 2.48.1