make proc_ns_operations work with struct ns_common * instead of void *

We can do that now.  And kill ->inum(), while we are at it - all instances
are identical.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

3 files changed, 8 insertions, 15 deletions

diff --git a/fs/namespace.c b/fs/namespace.c
index 5c21fdadabe4..b9c16c3f63f5 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -3149,7 +3149,7 @@ found:
         return visible;
 }
 
-static void *mntns_get(struct task_struct *task)
+static struct ns_common *mntns_get(struct task_struct *task)
 {
         struct ns_common *ns = NULL;
         struct nsproxy *nsproxy;
@@ -3165,12 +3165,12 @@ static void *mntns_get(struct task_struct *task)
         return ns;
 }
 
-static void mntns_put(void *ns)
+static void mntns_put(struct ns_common *ns)
 {
         put_mnt_ns(to_mnt_ns(ns));
 }
 
-static int mntns_install(struct nsproxy *nsproxy, void *ns)
+static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
 {
         struct fs_struct *fs = current->fs;
         struct mnt_namespace *mnt_ns = to_mnt_ns(ns);
@@ -3203,17 +3203,10 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
         return 0;
 }
 
-static unsigned int mntns_inum(void *ns)
-{
-        struct ns_common *p = ns;
-        return p->inum;
-}
-
 const struct proc_ns_operations mntns_operations = {
         .name           = "mnt",
         .type           = CLONE_NEWNS,
         .get            = mntns_get,
         .put            = mntns_put,
         .install        = mntns_install,
-        .inum           = mntns_inum,
 };
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 333080d7a671..43b703c6cd3b 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -33,7 +33,7 @@ static void proc_evict_inode(struct inode *inode)
         struct proc_dir_entry *de;
         struct ctl_table_header *head;
         const struct proc_ns_operations *ns_ops;
-        void *ns;
+        struct ns_common *ns;
 
         truncate_inode_pages_final(&inode->i_data);
         clear_inode(inode);
diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c
index 89026095f2b5..995e8e98237d 100644
--- a/fs/proc/namespaces.c
+++ b/fs/proc/namespaces.c
@@ -64,7 +64,7 @@ static struct dentry *proc_ns_get_dentry(struct super_block *sb,
         struct inode *inode;
         struct proc_inode *ei;
         struct qstr qname = { .name = "", };
-        void *ns;
+        struct ns_common *ns;
 
         ns = ns_ops->get(task);
         if (!ns)
@@ -76,7 +76,7 @@ static struct dentry *proc_ns_get_dentry(struct super_block *sb,
                 return ERR_PTR(-ENOMEM);
         }
 
-        inode = iget_locked(sb, ns_ops->inum(ns));
+        inode = iget_locked(sb, ns->inum);
         if (!inode) {
                 dput(dentry);
                 ns_ops->put(ns);
@@ -144,7 +144,7 @@ static int proc_ns_readlink(struct dentry *dentry, char __user *buffer, int bufl
         struct proc_inode *ei = PROC_I(inode);
         const struct proc_ns_operations *ns_ops = ei->ns.ns_ops;
         struct task_struct *task;
-        void *ns;
+        struct ns_common *ns;
         char name[50];
         int res = -EACCES;
 
@@ -160,7 +160,7 @@ static int proc_ns_readlink(struct dentry *dentry, char __user *buffer, int bufl
         if (!ns)
                 goto out_put_task;
 
-        snprintf(name, sizeof(name), "%s:[%u]", ns_ops->name, ns_ops->inum(ns));
+        snprintf(name, sizeof(name), "%s:[%u]", ns_ops->name, ns->inum);
         res = readlink_copy(buffer, buflen, name);
         ns_ops->put(ns);
 out_put_task: