From: Al Viro <viro@zeniv.linux.org.uk>
To: linux-fsdevel@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Christian Brauner <brauner@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 12/20] d_alloc_pseudo(): move setting ->d_op there from the (sole) caller
Date: Fri, 24 Nov 2023 06:06:36 +0000 [thread overview]
Message-ID: <20231124060644.576611-12-viro@zeniv.linux.org.uk> (raw)
In-Reply-To: <20231124060644.576611-1-viro@zeniv.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/dcache.c | 8 +++++++-
fs/file_table.c | 5 -----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/fs/dcache.c b/fs/dcache.c
index 6dde21dbdd1a..1296a3fa4f93 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1890,9 +1890,15 @@ struct dentry *d_alloc_cursor(struct dentry * parent)
*/
struct dentry *d_alloc_pseudo(struct super_block *sb, const struct qstr *name)
{
+ static const struct dentry_operations anon_ops = {
+ .d_dname = simple_dname
+ };
struct dentry *dentry = __d_alloc(sb, name);
- if (likely(dentry))
+ if (likely(dentry)) {
dentry->d_flags |= DCACHE_NORCU;
+ if (!sb->s_d_op)
+ d_set_d_op(dentry, &anon_ops);
+ }
return dentry;
}
diff --git a/fs/file_table.c b/fs/file_table.c
index de4a2915bfd4..8889cbee13f8 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -329,9 +329,6 @@ struct file *alloc_file_pseudo(struct inode *inode, struct vfsmount *mnt,
const char *name, int flags,
const struct file_operations *fops)
{
- static const struct dentry_operations anon_ops = {
- .d_dname = simple_dname
- };
struct qstr this = QSTR_INIT(name, strlen(name));
struct path path;
struct file *file;
@@ -339,8 +336,6 @@ struct file *alloc_file_pseudo(struct inode *inode, struct vfsmount *mnt,
path.dentry = d_alloc_pseudo(mnt->mnt_sb, &this);
if (!path.dentry)
return ERR_PTR(-ENOMEM);
- if (!mnt->mnt_sb->s_d_op)
- d_set_d_op(path.dentry, &anon_ops);
path.mnt = mntget(mnt);
d_instantiate(path.dentry, inode);
file = alloc_file(&path, flags, fops);
--
2.39.2
next prev parent reply other threads:[~2023-11-24 6:11 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-24 6:05 [PATCHES] assorted dcache stuff Al Viro
2023-11-24 6:06 ` [PATCH 01/20] selinux: saner handling of policy reloads Al Viro
2023-11-24 6:06 ` [PATCH 02/20] ovl: stop using d_alloc_anon()/d_instantiate_anon() Al Viro
2023-11-24 6:06 ` [PATCH 03/20] struct dentry: get rid of randomize_layout idiocy Al Viro
2023-11-24 6:06 ` [PATCH 04/20] get rid of __dget() Al Viro
2023-11-24 6:06 ` [PATCH 05/20] DCACHE_... ->d_flags bits: switch to BIT() Al Viro
2023-11-24 6:06 ` [PATCH 06/20] DCACHE_COOKIE: RIP Al Viro
2023-11-24 6:06 ` [PATCH 07/20] kill d_{is,set}_fallthru() Al Viro
2023-11-24 6:06 ` [PATCH 08/20] dentry.h: trim externs Al Viro
2023-11-24 6:06 ` [PATCH 09/20] [software coproarchaeology] dentry.h: kill a mysterious comment Al Viro
2023-11-24 7:37 ` Amir Goldstein
2023-11-24 8:11 ` Al Viro
2023-11-24 8:26 ` Al Viro
2023-11-24 8:29 ` Christian Brauner
2023-11-24 6:06 ` [PATCH 10/20] kill d_backing_dentry() Al Viro
2023-11-24 6:06 ` [PATCH 11/20] kill d_instantate_anon(), fold __d_instantiate_anon() into remaining caller Al Viro
2023-11-24 6:06 ` Al Viro [this message]
2023-11-24 6:06 ` [PATCH 13/20] nsfs: use d_make_root() Al Viro
2023-11-24 6:06 ` [PATCH 14/20] simple_fill_super(): don't bother with d_genocide() on failure Al Viro
2023-11-24 6:06 ` [PATCH 15/20] d_genocide(): move the extern into fs/internal.h Al Viro
2023-11-24 6:35 ` d_genocide()? What about d_holodomor(), d_massmurder(), d_execute_warcrimes()? " Cedric Blancher
2023-11-24 6:57 ` Al Viro
2023-11-24 7:48 ` Al Viro
2023-11-24 9:36 ` Martin Steigerwald
2023-11-24 18:21 ` identifiers Al Viro
2025-12-09 22:29 ` d_genocide()? What about d_holodomor(), d_massmurder(), d_execute_warcrimes()? Re: [PATCH 15/20] d_genocide(): move the extern into fs/internal.h Askar Safin
2023-11-24 6:06 ` [PATCH 16/20] get rid of DCACHE_GENOCIDE Al Viro
2023-11-24 6:06 ` [PATCH 17/20] d_alloc_parallel(): in-lookup hash insertion doesn't need an RCU variant Al Viro
2023-11-24 6:06 ` [PATCH 18/20] __d_unalias() doesn't use inode argument Al Viro
2023-11-24 6:06 ` [PATCH 19/20] kill DCACHE_MAY_FREE Al Viro
2023-11-24 6:06 ` [PATCH 20/20] dcache: remove unnecessary NULL check in dget_dlock() Al Viro
2023-11-24 21:41 ` [PATCHES] assorted dcache stuff Linus Torvalds
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=20231124060644.576611-12-viro@zeniv.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=brauner@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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
all inboxes | Powered by JetHome®