aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/root.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-11 08:46:53 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-11 08:46:53 -0400
commit336879b1da97fffc097f77c6d6f818660f2826f0 (patch)
tree4ddb4d1c5d2b67fb096c72e41d2a03b01a605041 /fs/proc/root.c
parent3d3cbd84300e7be1e53083cac0f6f9c12978ecb4 (diff)
parentfdcaa1dbb7c6ed419b10fb8cdb5001ab0a00538f (diff)
Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework
Dave asked me to do the backmerge before sending him the revised pull request, so here we go. Nothing fancy in the conflicts, just a few things changed right next to each another. Conflicts: drivers/gpu/drm/drm_irq.c Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'fs/proc/root.c')
-rw-r--r--fs/proc/root.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 5dbadecb234d..094e44d4a6be 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -149,6 +149,8 @@ static void proc_kill_sb(struct super_block *sb)
149 ns = (struct pid_namespace *)sb->s_fs_info; 149 ns = (struct pid_namespace *)sb->s_fs_info;
150 if (ns->proc_self) 150 if (ns->proc_self)
151 dput(ns->proc_self); 151 dput(ns->proc_self);
152 if (ns->proc_thread_self)
153 dput(ns->proc_thread_self);
152 kill_anon_super(sb); 154 kill_anon_super(sb);
153 put_pid_ns(ns); 155 put_pid_ns(ns);
154} 156}
@@ -170,6 +172,7 @@ void __init proc_root_init(void)
170 return; 172 return;
171 173
172 proc_self_init(); 174 proc_self_init();
175 proc_thread_self_init();
173 proc_symlink("mounts", NULL, "self/mounts"); 176 proc_symlink("mounts", NULL, "self/mounts");
174 177
175 proc_net_init(); 178 proc_net_init();
@@ -199,10 +202,10 @@ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
199 202
200static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, unsigned int flags) 203static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, unsigned int flags)
201{ 204{
202 if (!proc_lookup(dir, dentry, flags)) 205 if (!proc_pid_lookup(dir, dentry, flags))
203 return NULL; 206 return NULL;
204 207
205 return proc_pid_lookup(dir, dentry, flags); 208 return proc_lookup(dir, dentry, flags);
206} 209}
207 210
208static int proc_root_readdir(struct file *file, struct dir_context *ctx) 211static int proc_root_readdir(struct file *file, struct dir_context *ctx)