diff options
Diffstat (limited to 'fs/namespace.c')
-rw-r--r-- | fs/namespace.c | 13 |
1 files changed, 3 insertions, 10 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: | |||
3149 | return visible; | 3149 | return visible; |
3150 | } | 3150 | } |
3151 | 3151 | ||
3152 | static void *mntns_get(struct task_struct *task) | 3152 | static struct ns_common *mntns_get(struct task_struct *task) |
3153 | { | 3153 | { |
3154 | struct ns_common *ns = NULL; | 3154 | struct ns_common *ns = NULL; |
3155 | struct nsproxy *nsproxy; | 3155 | struct nsproxy *nsproxy; |
@@ -3165,12 +3165,12 @@ static void *mntns_get(struct task_struct *task) | |||
3165 | return ns; | 3165 | return ns; |
3166 | } | 3166 | } |
3167 | 3167 | ||
3168 | static void mntns_put(void *ns) | 3168 | static void mntns_put(struct ns_common *ns) |
3169 | { | 3169 | { |
3170 | put_mnt_ns(to_mnt_ns(ns)); | 3170 | put_mnt_ns(to_mnt_ns(ns)); |
3171 | } | 3171 | } |
3172 | 3172 | ||
3173 | static int mntns_install(struct nsproxy *nsproxy, void *ns) | 3173 | static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns) |
3174 | { | 3174 | { |
3175 | struct fs_struct *fs = current->fs; | 3175 | struct fs_struct *fs = current->fs; |
3176 | struct mnt_namespace *mnt_ns = to_mnt_ns(ns); | 3176 | struct mnt_namespace *mnt_ns = to_mnt_ns(ns); |
@@ -3203,17 +3203,10 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns) | |||
3203 | return 0; | 3203 | return 0; |
3204 | } | 3204 | } |
3205 | 3205 | ||
3206 | static unsigned int mntns_inum(void *ns) | ||
3207 | { | ||
3208 | struct ns_common *p = ns; | ||
3209 | return p->inum; | ||
3210 | } | ||
3211 | |||
3212 | const struct proc_ns_operations mntns_operations = { | 3206 | const struct proc_ns_operations mntns_operations = { |
3213 | .name = "mnt", | 3207 | .name = "mnt", |
3214 | .type = CLONE_NEWNS, | 3208 | .type = CLONE_NEWNS, |
3215 | .get = mntns_get, | 3209 | .get = mntns_get, |
3216 | .put = mntns_put, | 3210 | .put = mntns_put, |
3217 | .install = mntns_install, | 3211 | .install = mntns_install, |
3218 | .inum = mntns_inum, | ||
3219 | }; | 3212 | }; |