diff options
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 5b66b2b3624d..adc2ea2532a0 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
| @@ -2640,7 +2640,7 @@ dput_out: | |||
| 2640 | 2640 | ||
| 2641 | static void free_mnt_ns(struct mnt_namespace *ns) | 2641 | static void free_mnt_ns(struct mnt_namespace *ns) |
| 2642 | { | 2642 | { |
| 2643 | proc_free_inum(ns->proc_inum); | 2643 | proc_free_inum(ns->ns.inum); |
| 2644 | put_user_ns(ns->user_ns); | 2644 | put_user_ns(ns->user_ns); |
| 2645 | kfree(ns); | 2645 | kfree(ns); |
| 2646 | } | 2646 | } |
| @@ -2662,7 +2662,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns) | |||
| 2662 | new_ns = kmalloc(sizeof(struct mnt_namespace), GFP_KERNEL); | 2662 | new_ns = kmalloc(sizeof(struct mnt_namespace), GFP_KERNEL); |
| 2663 | if (!new_ns) | 2663 | if (!new_ns) |
| 2664 | return ERR_PTR(-ENOMEM); | 2664 | return ERR_PTR(-ENOMEM); |
| 2665 | ret = proc_alloc_inum(&new_ns->proc_inum); | 2665 | ret = proc_alloc_inum(&new_ns->ns.inum); |
| 2666 | if (ret) { | 2666 | if (ret) { |
| 2667 | kfree(new_ns); | 2667 | kfree(new_ns); |
| 2668 | return ERR_PTR(ret); | 2668 | return ERR_PTR(ret); |
| @@ -3201,7 +3201,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns) | |||
| 3201 | static unsigned int mntns_inum(void *ns) | 3201 | static unsigned int mntns_inum(void *ns) |
| 3202 | { | 3202 | { |
| 3203 | struct mnt_namespace *mnt_ns = ns; | 3203 | struct mnt_namespace *mnt_ns = ns; |
| 3204 | return mnt_ns->proc_inum; | 3204 | return mnt_ns->ns.inum; |
| 3205 | } | 3205 | } |
| 3206 | 3206 | ||
| 3207 | const struct proc_ns_operations mntns_operations = { | 3207 | const struct proc_ns_operations mntns_operations = { |
