From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [RFC][PATCH 18/27] ... and switch shmem_file_setup() to alloc_file_pseudo()
Date: Mon, 9 Jul 2018 05:54:08 +0100 [thread overview]
Message-ID: <20180709045417.13988-18-viro@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20180709045417.13988-1-viro@ZenIV.linux.org.uk>
From: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
mm/shmem.c | 39 ++++++++-------------------------------
1 file changed, 8 insertions(+), 31 deletions(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index 0aa290f849ee..fd21df189f32 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3896,18 +3896,11 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
/* common code */
-static const struct dentry_operations anon_ops = {
- .d_dname = simple_dname
-};
-
static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name, loff_t size,
unsigned long flags, unsigned int i_flags)
{
- struct file *res;
struct inode *inode;
- struct path path;
- struct super_block *sb;
- struct qstr this;
+ struct file *res;
if (IS_ERR(mnt))
return ERR_CAST(mnt);
@@ -3918,8 +3911,8 @@ static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name, l
if (shmem_acct_size(flags, size))
return ERR_PTR(-ENOMEM);
- sb = mnt->mnt_sb;
- inode = shmem_get_inode(sb, NULL, S_IFREG | S_IRWXUGO, 0, flags);
+ inode = shmem_get_inode(mnt->mnt_sb, NULL, S_IFREG | S_IRWXUGO, 0,
+ flags);
if (unlikely(!inode)) {
shmem_unacct_size(flags, size);
return ERR_PTR(-ENOSPC);
@@ -3928,28 +3921,12 @@ static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name, l
inode->i_size = size;
clear_nlink(inode); /* It is unlinked */
res = ERR_PTR(ramfs_nommu_expand_for_mapping(inode, size));
- if (IS_ERR(res)) {
- iput(inode);
- return res;
- }
-
- this.name = name;
- this.len = strlen(name);
- this.hash = 0; /* will go */
- path.mnt = mntget(mnt);
- path.dentry = d_alloc_pseudo(sb, &this);
- if (!path.dentry) {
- iput(inode);
- return ERR_PTR(-ENOMEM);
- }
- d_set_d_op(path.dentry, &anon_ops);
-
- d_instantiate(path.dentry, inode);
-
- res = alloc_file(&path, FMODE_WRITE | FMODE_READ | FMODE_OPENED,
- &shmem_file_operations);
+ if (!IS_ERR(res))
+ res = alloc_file_pseudo(inode, mnt, name,
+ FMODE_WRITE | FMODE_READ,
+ &shmem_file_operations);
if (IS_ERR(res))
- path_put(&path);
+ iput(inode);
return res;
}
--
2.11.0
next prev parent reply other threads:[~2018-07-09 4:57 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-09 4:53 [RFC][PATCHES] open()-related cleanups Al Viro
2018-07-09 4:53 ` [RFC][PATCH 01/27] drm_mode_create_lease_ioctl(): fix open-coded filp_clone_open() Al Viro
2018-07-09 4:53 ` [RFC][PATCH 02/27] cxl_getfile(): fix double-iput() on alloc_file() failures Al Viro
2018-07-09 4:53 ` [RFC][PATCH 03/27] ocxlflash_getfile(): " Al Viro
2018-07-09 4:53 ` [RFC][PATCH 04/27] make sure do_dentry_open() won't return positive as an error Al Viro
2018-07-09 4:53 ` [RFC][PATCH 05/27] introduce FMODE_OPENED Al Viro
2018-07-09 4:53 ` [RFC][PATCH 06/27] get rid of 'opened' argument of finish_open() Al Viro
2018-07-09 4:53 ` [RFC][PATCH 07/27] lift fput() on late failures into path_openat() Al Viro
2018-07-09 4:53 ` [RFC][PATCH 08/27] switch all remaining checks for FILE_OPENED to FMODE_OPENED Al Viro
2018-07-09 4:53 ` [RFC][PATCH 09/27] now we can fold open_check_o_direct() into do_dentry_open() Al Viro
2018-07-09 4:54 ` [RFC][PATCH 10/27] introduce FMODE_CREATED and switch to it Al Viro
2018-07-09 4:54 ` [RFC][PATCH 11/27] IMA: don't propagate opened through the entire thing Al Viro
2018-07-09 4:54 ` [RFC][PATCH 12/27] Preparation to killing ->atomic_open() 'opened' argument Al Viro
2018-07-09 4:54 ` [RFC][PATCH 13/27] get rid of 'opened' argument of ->atomic_open() Al Viro
2018-07-09 4:54 ` [RFC][PATCH 14/27] get rid of 'opened' in path_openat() and the helpers downstream Al Viro
2018-07-09 4:54 ` [RFC][PATCH 15/27] kill FILE_{CREATED,OPENED} Al Viro
2018-07-09 4:54 ` [RFC][PATCH 16/27] new wrapper: alloc_file_pseudo() Al Viro
2018-07-09 4:54 ` [RFC][PATCH 17/27] __shmem_file_setup(): reorder allocations Al Viro
2018-07-09 4:54 ` Al Viro [this message]
2018-07-09 4:54 ` [RFC][PATCH 19/27] cxl_getfile(): switch to alloc_file_pseudo() Al Viro
2018-07-09 4:54 ` [RFC][PATCH 20/27] ocxlflash_getfile(): " Al Viro
2018-07-09 4:54 ` [RFC][PATCH 21/27] hugetlb_file_setup(): " Al Viro
2018-07-09 4:54 ` [RFC][PATCH 22/27] anon_inode_getfile(): " Al Viro
2018-07-09 4:54 ` [RFC][PATCH 23/27] create_pipe_files(): switch the first allocation " Al Viro
2018-07-09 4:54 ` [RFC][PATCH 24/27] new helper: alloc_file_clone() Al Viro
2018-07-09 4:54 ` [RFC][PATCH 25/27] do_shmat(): grab shp->shm_file earlier, switch to alloc_file_clone() Al Viro
2018-07-09 4:54 ` [RFC][PATCH 26/27] make alloc_file() static Al Viro
2018-07-09 4:54 ` [RFC][PATCH 27/27] turn filp_clone_open() into inline wrapper for dentry_open() Al Viro
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=20180709045417.13988-18-viro@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--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®