From nobody Thu Apr 9 13:33:31 2026 Received: from flow-a8-smtp.messagingengine.com (flow-a8-smtp.messagingengine.com [103.168.172.143]) (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 CAAA22DC76A; Sun, 8 Mar 2026 20:58:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.143 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773003493; cv=none; b=B297i3ac83a5LtfAnTu3QFoAx73NrDezv0WPCCdQDnNvZRRpKusj/PbsUypdprXyGYdwpq1rPQn+2EJM0tVq6GE6s+JcLapx1t7ZGNqeZFNMtElaPXZ/ZoTgvoQjgDVX3O1H5lFmDvTHelvofJDHjyWz5aHhtUmAYkiNOywHR8s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773003493; c=relaxed/simple; bh=YvwnwHgyC3oEQa0I1j525crmDtzyCfGyFwtXdz585BU=; h=Content-Type:MIME-Version:From:To:Cc:Subject:In-reply-to: References:Date:Message-id; b=JGIWJJs+q6wT81end9ZjfD6AqjuQ9n0tTyTG0nSJUtrnZ5xYp3HPxcYa5qYbDfuAo1+c067qa6AH9vbBSM1vfagItGITJjlWtnMdCZMnFx3vt09TEHahhYTFXJFZ17emeQj8GRz7WcMpAUa3YvQoL73sV65tfvajw6D2LRhFrhI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ownmail.net; spf=pass smtp.mailfrom=ownmail.net; dkim=pass (2048-bit key) header.d=ownmail.net header.i=@ownmail.net header.b=Nyy1fGep; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=GHGSibMw; arc=none smtp.client-ip=103.168.172.143 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ownmail.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ownmail.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ownmail.net header.i=@ownmail.net header.b="Nyy1fGep"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="GHGSibMw" Received: from phl-compute-09.internal (phl-compute-09.internal [10.202.2.49]) by mailflow.phl.internal (Postfix) with ESMTP id E5D3B13808ED; Sun, 8 Mar 2026 16:58:09 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-09.internal (MEProxy); Sun, 08 Mar 2026 16:58:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ownmail.net; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:reply-to:subject:subject:to:to; s=fm1; t= 1773003489; x=1773010689; bh=+iypvS0zaTSKL0sJFSGnV+90rJ7NwnakODh 88UBVbxc=; b=Nyy1fGep1NAOdoC4ys0fihQQOAa4IL42zfq0IvtSw9HwYJLZAur Ps92XTBfup1MiJY2jk4/AQz2th5KZLEBqfMaYNhvwb99g0LBwKnM8xUEEKXdgKTn iEZgi2XRPUc5mOsju+U1SsZ0XuTk97e1G+TvaUs0UgEWuCEpGvKxHub7Fr8NzePQ F6jc70Xi+GLzG48D6AKuJRyzr/qNVEz6PSACk6zG7NyURmA+z9W+GYGQUz9Sequ0 MDP8DWX9s7NcXZnQ17acBLw3uNCm42d4dV4qgFTfdT/1lWc1ZOIsJxzbxZXjIvWM uVaaeebTvdn1kw4vaeRvQyoQY4+vkAqWiiQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1773003489; x= 1773010689; bh=+iypvS0zaTSKL0sJFSGnV+90rJ7NwnakODh88UBVbxc=; b=G HGSibMweZXfcFPVEa8qTAg1920mH8b3M5plTJQ4y5f96lM0ypf27HM4c/UAySBmm DZNhGy5ImsPGICRiTdhRP+TGXvBFmWPZY17dh7fXetsdhXCks4IMB/rP6iNp1iaU LK91YfzxM0GOGNH9+s3glVWI7DpuSJrqrRuxGMPR04EVCO/4tRv4OyVYYCSthsLo hVCdX/pAxOcMFN6CQkYecarwAp2sSGJQEDC2Nu+eqjJ5ZgA6455m7flLIqp54XFo jil7fvItfzmz1OnLWw0UW+svzSwXlPLSAQBfEev4w8rFBaDivkzKy7ULy0nxmm+M KgkBFxXdL2RO4I2Y5xVNQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgddvjeeivddvucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurheptgfgggfhvfevufgjfhffkfhrsehtqhertddttdejnecuhfhrohhmpefpvghilheu rhhofihnuceonhgvihhlsgesohifnhhmrghilhdrnhgvtheqnecuggftrfgrthhtvghrnh epffetfedvgeevjeelhffhkefgffejvddtvefftdegueeiveffjeeukeffkeefkefhnecu ffhomhgrihhnpehmshhgihgurdhlihhnkhenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehnvghilhgssehofihnmhgrihhlrdhnvghtpdhnsggp rhgtphhtthhopedvvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepvhhirhhose iivghnihhvrdhlihhnuhigrdhorhhgrdhukhdprhgtphhtthhopehsvghlihhnuhigsehv ghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtoheplhhinhhugidquhhnihhonhhfsh esvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehlihhnuhigqdhsvggtuhhr ihhthidqmhhoughulhgvsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtoheplh hinhhugidqnhhfshesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehlihhn uhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehlih hnuhigqdhfshguvghvvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohep mhhikhhlohhssehsiigvrhgvughirdhhuhdprhgtphhtthhopehjrggtkhesshhushgvrd gtii X-ME-Proxy: Feedback-ID: i9d664b8f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 8 Mar 2026 16:58:01 -0400 (EDT) Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: NeilBrown To: "Christian Brauner" Cc: "Alexander Viro" , "David Howells" , "Jan Kara" , "Chuck Lever" , "Jeff Layton" , "Miklos Szeredi" , "Amir Goldstein" , "John Johansen" , "Paul Moore" , "James Morris" , "Serge E. Hallyn" , "Stephen Smalley" , "Darrick J. Wong" , linux-kernel@vger.kernel.org, netfs@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-unionfs@vger.kernel.org, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Subject: [PATCH] FIXUP: cachefiles: change cachefiles_bury_object to use start_renaming_dentry() In-reply-to: <20260306-stolz-verzichten-2ee626da4503@brauner> References: <20260224222542.3458677-1-neilb@ownmail.net>, <20260224222542.3458677-11-neilb@ownmail.net>, <20260306-stolz-verzichten-2ee626da4503@brauner> Date: Mon, 09 Mar 2026 07:57:58 +1100 Message-id: <177300347820.5556.314358492166337403@noble.neil.brown.name> Reply-To: NeilBrown From: NeilBrown [[This fixup for f242581e611e in vfs/vfs-7.1.directory provides a new commit description has preserves the error returns and log message, and importantly calls cachefiles_io_error() in exactly the same circumstances as the original - thanks]] Rather then using lock_rename() and lookup_one() etc we can use the new start_renaming_dentry(). This is part of centralising dir locking and lookup so that locking rules can be changed. Some error conditions are checked in start_renaming_dentry() but need to be re-checked when an error is reported to ensure correct handling. The check that ->graveyard is still d_can_lookup() is dropped as this was checked when ->graveyard was assigned, and it cannot be changed. Signed-off-by: NeilBrown Link: https://patch.msgid.link/20260224222542.3458677-11-neilb@ownmail.net --- fs/cachefiles/namei.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c index 3af42ec78411..c464c72a51cb 100644 --- a/fs/cachefiles/namei.c +++ b/fs/cachefiles/namei.c @@ -309,7 +309,26 @@ int cachefiles_bury_object(struct cachefiles_cache *ca= che, rd.flags =3D 0; ret =3D start_renaming_dentry(&rd, 0, rep, &QSTR(nbuffer)); if (ret) { - cachefiles_io_error(cache, "Cannot lock/lookup in graveyard"); + /* Some errors aren't fatal */ + if (ret =3D=3D -EXDEV) + /* double-lock failed */ + return ret; + if (d_unhashed(rep) || rep->d_parent !=3D dir || IS_DEADDIR(d_inode(rep)= )) { + /* the entry was probably culled when we dropped the parent dir + * lock */ + _leave(" =3D 0 [culled?]"); + return 0; + } + if (ret =3D=3D -EINVAL || ret =3D=3D -ENOTEMPTY) { + cachefiles_io_error(cache, "May not make directory loop"); + return -EIO; + } + if (ret =3D=3D -ENOMEM) { + _leave(" =3D -ENOMEM"); + return -ENOMEM; + } + + cachefiles_io_error(cache, "Lookup error %d", ret); return -EIO; } =20 --=20 2.50.0.107.gf914562f5916.dirty