From: Christian Brauner <brauner@kernel.org>
To: linux-fsdevel@vger.kernel.org
Cc: "Jann Horn" <jannh@google.com>,
"Josef Bacik" <josef@toxicpanda.com>,
"Jeff Layton" <jlayton@kernel.org>,
"Daan De Meyer" <daan.j.demeyer@gmail.com>,
"Lennart Poettering" <lennart@poettering.net>,
"Mike Yuan" <me@yhndnzj.com>,
"Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>,
"Christian Brauner" <brauner@kernel.org>,
"Alexander Mikhalitsyn" <alexander@mihalicyn.com>
Subject: [PATCH v2 03/16] libfs: massage path_from_stashed()
Date: Wed, 18 Jun 2025 22:53:37 +0200 [thread overview]
Message-ID: <20250618-work-pidfs-persistent-v2-3-98f3456fd552@kernel.org> (raw)
In-Reply-To: <20250618-work-pidfs-persistent-v2-0-98f3456fd552@kernel.org>
Make it a littler easier to follow.
Signed-off-by: Christian Brauner <brauner@kernel.org>
---
fs/libfs.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/fs/libfs.c b/fs/libfs.c
index 3541e22c87b5..997d3a363ce6 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -2227,9 +2227,8 @@ int path_from_stashed(struct dentry **stashed, struct vfsmount *mnt, void *data,
if (IS_ERR(res))
return PTR_ERR(res);
if (res) {
- path->dentry = res;
sops->put_data(data);
- goto out_path;
+ goto make_path;
}
/* Allocate a new dentry. */
@@ -2246,15 +2245,14 @@ int path_from_stashed(struct dentry **stashed, struct vfsmount *mnt, void *data,
dput(dentry);
return PTR_ERR(res);
}
- path->dentry = res;
- /* A dentry was reused. */
if (res != dentry)
dput(dentry);
-out_path:
- WARN_ON_ONCE(path->dentry->d_fsdata != stashed);
- WARN_ON_ONCE(d_inode(path->dentry)->i_private != data);
+make_path:
+ path->dentry = res;
path->mnt = mntget(mnt);
+ VFS_WARN_ON_ONCE(path->dentry->d_fsdata != stashed);
+ VFS_WARN_ON_ONCE(d_inode(path->dentry)->i_private != data);
return 0;
}
--
2.47.2
next prev parent reply other threads:[~2025-06-18 20:53 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-18 20:53 [PATCH v2 00/16] pidfs: persistent info & xattrs Christian Brauner
2025-06-18 20:53 ` [PATCH v2 01/16] pidfs: raise SB_I_NODEV and SB_I_NOEXEC Christian Brauner
2025-06-22 20:37 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 02/16] libfs: massage path_from_stashed() to allow custom stashing behavior Christian Brauner
2025-06-22 20:40 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` Christian Brauner [this message]
2025-06-22 20:42 ` [PATCH v2 03/16] libfs: massage path_from_stashed() Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 04/16] pidfs: move to anonymous struct Christian Brauner
2025-06-22 20:44 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 05/16] pidfs: persist information Christian Brauner
2025-06-22 21:09 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 06/16] pidfs: remove unused members from struct pidfs_inode Christian Brauner
2025-06-22 21:10 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 07/16] pidfs: remove custom inode allocation Christian Brauner
2025-06-22 21:10 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 08/16] pidfs: remove pidfs_{get,put}_pid() Christian Brauner
2025-06-22 21:11 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 09/16] pidfs: remove pidfs_pid_valid() Christian Brauner
2025-06-22 21:13 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 10/16] libfs: prepare to allow for non-immutable pidfd inodes Christian Brauner
2025-06-22 21:14 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 11/16] pidfs: make inodes mutable Christian Brauner
2025-06-22 21:14 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 12/16] pidfs: support xattrs on pidfds Christian Brauner
2025-06-22 21:19 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 13/16] selftests/pidfd: test extended attribute support Christian Brauner
2025-06-22 21:21 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 14/16] " Christian Brauner
2025-06-22 21:21 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 15/16] selftests/pidfd: test setattr support Christian Brauner
2025-06-22 21:22 ` Alexander Mikhalitsyn
2025-06-18 20:53 ` [PATCH v2 16/16] pidfs: add some CONFIG_DEBUG_VFS asserts Christian Brauner
2025-06-22 21:22 ` Alexander Mikhalitsyn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250618-work-pidfs-persistent-v2-3-98f3456fd552@kernel.org \
--to=brauner@kernel.org \
--cc=alexander@mihalicyn.com \
--cc=daan.j.demeyer@gmail.com \
--cc=jannh@google.com \
--cc=jlayton@kernel.org \
--cc=josef@toxicpanda.com \
--cc=lennart@poettering.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=me@yhndnzj.com \
--cc=zbyszek@in.waw.pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).