From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 23DC03B8D5C; Thu, 5 Feb 2026 12:38:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770295114; cv=none; b=nNGnaThO9rP2kGDXfX+2DujQ7gZjVgsFnYsBm2h2IOH8lm4X0VZsgLFhne0Ni/8aiNb5gddqw8TjW3EC2jI5paSZ/wTq6m2889kVUlly/+hwL0PjrUZfNlzRxglSY4Cq2PoM8NAgRwBpMFiWzbRSuMq9+Ns/wrQQKEhhr+qvZCQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770295114; c=relaxed/simple; bh=ZFCAVurOAODnUWuC42DcwQ1f8hacTr/mLSJJhxqxUJE=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=NeA9PQuqMvnLq8IxoEZ74km0vEukrvEwteY//ko6USZdWh5ctdqgIIALDVWV/qAokEQ3ASbvBSDzH+N7qMB5SX0YdGk/frmD8wYLgIZayBMwtno+VWCfW9v6Axb9JZnlQptUtq+JCVmRPLH9w/+KXStkmN8oYWqS0r9uqhUYXNc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KBjBx33o; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KBjBx33o" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8B16C16AAE; Thu, 5 Feb 2026 12:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770295113; bh=ZFCAVurOAODnUWuC42DcwQ1f8hacTr/mLSJJhxqxUJE=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=KBjBx33oVnMR9gFD5SCO3tA1yh1XFz0bmnu2AneWHNpOYVSruH05XhP/Mp38yecGa sUbdRkUWAP0n0mJxp3G22N2PTV0W+u3/PT5xe3sV6bG9ngAONpiTVQ/czJtA8aXZ9A rAMgH+4iNVeYTSxT+KI3oQlAc7Ngbih98XreqyfxiN7WctB6CMVNJKi1YP5Ywh1WEO Xrs7jZKWZiJEYR8ou82aFGU50tf21JUDdAIeW36CWqQoZ0dbJj0kYIZCXcB47Y002O fdvy8PUqeaQAJsdtvD3PZnSPVAghvjHAiWgES8M0vav55p4PCWarwRAaEgEg55cuZ4 sTdY0SSdgJkYA== Message-ID: <4d2c35c1b627f1ad26062a92d653677d7b79bd81.camel@kernel.org> Subject: Re: [PATCH 09/13] cachefiles: change cachefiles_bury_object to use start_renaming_dentry() From: Jeff Layton To: NeilBrown , Christian Brauner , Alexander Viro , David Howells , Jan Kara , Chuck Lever , Miklos Szeredi , Amir Goldstein , John Johansen , Paul Moore , James Morris , "Serge E. Hallyn" , Stephen Smalley Cc: 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 Date: Thu, 05 Feb 2026 07:38:30 -0500 In-Reply-To: <20260204050726.177283-10-neilb@ownmail.net> References: <20260204050726.177283-1-neilb@ownmail.net> <20260204050726.177283-10-neilb@ownmail.net> Autocrypt: addr=jlayton@kernel.org; prefer-encrypt=mutual; keydata=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 QZIQXVeAA+smfTT0tDrisj1U5x6ZB9b3nBg65kc= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.58.2 (3.58.2-1.fc43) Precedence: bulk X-Mailing-List: linux-unionfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Wed, 2026-02-04 at 15:57 +1100, NeilBrown wrote: > From: NeilBrown >=20 > 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. >=20 > Some error check are removed as not necessary. Checks for rep being a > non-dir or IS_DEADDIR and the check that ->graveyard is still a > directory only provide slightly more informative errors and have been > dropped. >=20 > Signed-off-by: NeilBrown > --- > fs/cachefiles/namei.c | 76 ++++++++----------------------------------- > 1 file changed, 14 insertions(+), 62 deletions(-) >=20 > diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c > index e5ec90dccc27..3af42ec78411 100644 > --- a/fs/cachefiles/namei.c > +++ b/fs/cachefiles/namei.c > @@ -270,7 +270,8 @@ int cachefiles_bury_object(struct cachefiles_cache *c= ache, > struct dentry *rep, > enum fscache_why_object_killed why) > { > - struct dentry *grave, *trap; > + struct dentry *grave; > + struct renamedata rd =3D {}; > struct path path, path_to_graveyard; > char nbuffer[8 + 8 + 1]; > int ret; > @@ -302,77 +303,36 @@ int cachefiles_bury_object(struct cachefiles_cache = *cache, > (uint32_t) ktime_get_real_seconds(), > (uint32_t) atomic_inc_return(&cache->gravecounter)); > =20 > - /* do the multiway lock magic */ > - trap =3D lock_rename(cache->graveyard, dir); > - if (IS_ERR(trap)) > - return PTR_ERR(trap); > - > - /* do some checks before getting the grave dentry */ > - if (rep->d_parent !=3D dir || IS_DEADDIR(d_inode(rep))) { > - /* the entry was probably culled when we dropped the parent dir > - * lock */ > - unlock_rename(cache->graveyard, dir); > - _leave(" =3D 0 [culled?]"); > - return 0; > - } > - > - if (!d_can_lookup(cache->graveyard)) { > - unlock_rename(cache->graveyard, dir); > - cachefiles_io_error(cache, "Graveyard no longer a directory"); > - return -EIO; > - } > - > - if (trap =3D=3D rep) { > - unlock_rename(cache->graveyard, dir); > - cachefiles_io_error(cache, "May not make directory loop"); > + rd.mnt_idmap =3D &nop_mnt_idmap; > + rd.old_parent =3D dir; > + rd.new_parent =3D cache->graveyard; > + 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"); > return -EIO; > } > =20 > if (d_mountpoint(rep)) { > - unlock_rename(cache->graveyard, dir); > + end_renaming(&rd); > cachefiles_io_error(cache, "Mountpoint in cache"); > return -EIO; > } > =20 > - grave =3D lookup_one(&nop_mnt_idmap, &QSTR(nbuffer), cache->graveyard); > - if (IS_ERR(grave)) { > - unlock_rename(cache->graveyard, dir); > - trace_cachefiles_vfs_error(object, d_inode(cache->graveyard), > - PTR_ERR(grave), > - cachefiles_trace_lookup_error); > - > - if (PTR_ERR(grave) =3D=3D -ENOMEM) { > - _leave(" =3D -ENOMEM"); > - return -ENOMEM; > - } > - > - cachefiles_io_error(cache, "Lookup error %ld", PTR_ERR(grave)); > - return -EIO; > - } > - > + grave =3D rd.new_dentry; > if (d_is_positive(grave)) { > - unlock_rename(cache->graveyard, dir); > - dput(grave); > + end_renaming(&rd); > grave =3D NULL; > cond_resched(); > goto try_again; > } > =20 > if (d_mountpoint(grave)) { > - unlock_rename(cache->graveyard, dir); > - dput(grave); > + end_renaming(&rd); > cachefiles_io_error(cache, "Mountpoint in graveyard"); > return -EIO; > } > =20 > - /* target should not be an ancestor of source */ > - if (trap =3D=3D grave) { > - unlock_rename(cache->graveyard, dir); > - dput(grave); > - cachefiles_io_error(cache, "May not make directory loop"); > - return -EIO; > - } > - > /* attempt the rename */ > path.mnt =3D cache->mnt; > path.dentry =3D dir; > @@ -382,13 +342,6 @@ int cachefiles_bury_object(struct cachefiles_cache *= cache, > if (ret < 0) { > cachefiles_io_error(cache, "Rename security error %d", ret); > } else { > - struct renamedata rd =3D { > - .mnt_idmap =3D &nop_mnt_idmap, > - .old_parent =3D dir, > - .old_dentry =3D rep, > - .new_parent =3D cache->graveyard, > - .new_dentry =3D grave, > - }; > trace_cachefiles_rename(object, d_inode(rep)->i_ino, why); > ret =3D cachefiles_inject_read_error(); > if (ret =3D=3D 0) > @@ -402,8 +355,7 @@ int cachefiles_bury_object(struct cachefiles_cache *c= ache, > } > =20 > __cachefiles_unmark_inode_in_use(object, d_inode(rep)); > - unlock_rename(cache->graveyard, dir); > - dput(grave); > + end_renaming(&rd); > _leave(" =3D 0"); > return 0; > } Reviewed-by: Jeff Layton