aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-11-01 02:32:53 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-04 14:34:47 -0500
commit33c429405a2c8d9e42afb9fee88a63cfb2de1e98 (patch)
treed2ffe096cd36852049b844c8befd1ba0ba6cf18c /fs/proc
parent6344c433a452b1a05d03a61a6a85d89f793bb7b8 (diff)
copy address of proc_ns_ops into ns_common
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/inode.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 43b703c6cd3b..a212996e0987 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -32,7 +32,6 @@ static void proc_evict_inode(struct inode *inode)
32{ 32{
33 struct proc_dir_entry *de; 33 struct proc_dir_entry *de;
34 struct ctl_table_header *head; 34 struct ctl_table_header *head;
35 const struct proc_ns_operations *ns_ops;
36 struct ns_common *ns; 35 struct ns_common *ns;
37 36
38 truncate_inode_pages_final(&inode->i_data); 37 truncate_inode_pages_final(&inode->i_data);
@@ -51,10 +50,9 @@ static void proc_evict_inode(struct inode *inode)
51 sysctl_head_put(head); 50 sysctl_head_put(head);
52 } 51 }
53 /* Release any associated namespace */ 52 /* Release any associated namespace */
54 ns_ops = PROC_I(inode)->ns.ns_ops;
55 ns = PROC_I(inode)->ns.ns; 53 ns = PROC_I(inode)->ns.ns;
56 if (ns_ops && ns) 54 if (ns && ns->ops)
57 ns_ops->put(ns); 55 ns->ops->put(ns);
58} 56}
59 57
60static struct kmem_cache * proc_inode_cachep; 58static struct kmem_cache * proc_inode_cachep;