aboutsummaryrefslogtreecommitdiffstats
path: root/fs/anon_inodes.c
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2009-11-17 23:30:19 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2009-12-17 10:51:40 -0500
commita3a065e3f13da8a3470ed09c7f38aad256083726 (patch)
tree03e36f66709fe3d1679b0f0036f2ad3449d92dee /fs/anon_inodes.c
parentb9aff027b2c1d6019d237382c78fd396f9de2ea5 (diff)
fs: no games with DCACHE_UNHASHED
Filesystems outside the regular namespace do not have to clear DCACHE_UNHASHED in order to have a working /proc/$pid/fd/XXX. Nothing in proc prevents the fd link from being used if its dentry is not in the hash. Also, it does not get put into the dcache hash if DCACHE_UNHASHED is clear; that depends on the filesystem calling d_add or d_rehash. So delete the misleading comments and needless code. Acked-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/anon_inodes.c')
-rw-r--r--fs/anon_inodes.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c
index 01c529a3f7d2..2c994591f4d7 100644
--- a/fs/anon_inodes.c
+++ b/fs/anon_inodes.c
@@ -35,16 +35,6 @@ static int anon_inodefs_get_sb(struct file_system_type *fs_type, int flags,
35 mnt); 35 mnt);
36} 36}
37 37
38static int anon_inodefs_delete_dentry(struct dentry *dentry)
39{
40 /*
41 * We faked vfs to believe the dentry was hashed when we created it.
42 * Now we restore the flag so that dput() will work correctly.
43 */
44 dentry->d_flags |= DCACHE_UNHASHED;
45 return 1;
46}
47
48/* 38/*
49 * anon_inodefs_dname() is called from d_path(). 39 * anon_inodefs_dname() is called from d_path().
50 */ 40 */
@@ -60,7 +50,6 @@ static struct file_system_type anon_inode_fs_type = {
60 .kill_sb = kill_anon_super, 50 .kill_sb = kill_anon_super,
61}; 51};
62static const struct dentry_operations anon_inodefs_dentry_operations = { 52static const struct dentry_operations anon_inodefs_dentry_operations = {
63 .d_delete = anon_inodefs_delete_dentry,
64 .d_dname = anon_inodefs_dname, 53 .d_dname = anon_inodefs_dname,
65}; 54};
66 55
@@ -129,8 +118,6 @@ struct file *anon_inode_getfile(const char *name,
129 atomic_inc(&anon_inode_inode->i_count); 118 atomic_inc(&anon_inode_inode->i_count);
130 119
131 path.dentry->d_op = &anon_inodefs_dentry_operations; 120 path.dentry->d_op = &anon_inodefs_dentry_operations;
132 /* Do not publish this dentry inside the global dentry hash table */
133 path.dentry->d_flags &= ~DCACHE_UNHASHED;
134 d_instantiate(path.dentry, anon_inode_inode); 121 d_instantiate(path.dentry, anon_inode_inode);
135 122
136 error = -ENFILE; 123 error = -ENFILE;