diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-14 22:38:02 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-26 02:43:22 -0500 |
| commit | 3451538a114d738a6528b1da58e19e7d8964c647 (patch) | |
| tree | 6aeefee69b655c3a0817c6fb7c3771d69937e630 | |
| parent | 3f3834c35466324e3a7d7bf3a950dbcd99645f38 (diff) | |
| download | linux-3.10-3451538a114d738a6528b1da58e19e7d8964c647.tar.gz linux-3.10-3451538a114d738a6528b1da58e19e7d8964c647.tar.bz2 linux-3.10-3451538a114d738a6528b1da58e19e7d8964c647.zip | |
shmem_setup_file(): use d_alloc_pseudo() instead of d_alloc()
Note that provided ->d_dname() reproduces what we used to get for
those guys in e.g. /proc/self/maps; it might be a good idea to change
that to something less ugly, but for now let's keep the existing
user-visible behaviour
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | mm/shmem.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 8b4c198552b..25cd688bd20 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2865,6 +2865,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range); /* common code */ +static char *shmem_dname(struct dentry *dentry, char *buffer, int buflen) +{ + return dynamic_dname(dentry, buffer, buflen, "/%s (deleted)", + dentry->d_name.name); +} + +static struct dentry_operations anon_ops = { + .d_dname = shmem_dname +}; + /** * shmem_file_setup - get an unlinked file living in tmpfs * @name: name for dentry (to be seen in /proc/<pid>/maps @@ -2876,7 +2886,7 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags struct file *res; struct inode *inode; struct path path; - struct dentry *root; + struct super_block *sb; struct qstr this; if (IS_ERR(shm_mnt)) @@ -2892,14 +2902,15 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags this.name = name; this.len = strlen(name); this.hash = 0; /* will go */ - root = shm_mnt->mnt_root; - path.dentry = d_alloc(root, &this); + sb = shm_mnt->mnt_sb; + path.dentry = d_alloc_pseudo(sb, &this); if (!path.dentry) goto put_memory; + d_set_d_op(path.dentry, &anon_ops); path.mnt = mntget(shm_mnt); res = ERR_PTR(-ENOSPC); - inode = shmem_get_inode(root->d_sb, NULL, S_IFREG | S_IRWXUGO, 0, flags); + inode = shmem_get_inode(sb, NULL, S_IFREG | S_IRWXUGO, 0, flags); if (!inode) goto put_dentry; |