Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / ipc / mqueue.c

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 65c351564ad080483714ddf2c9c82b4e86f8c873..7a5a8edc3de3f6f30fa416147618d8e4caba5704 100644 (file)
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -364,8 +364,6 @@ static int mqueue_get_tree(struct fs_context *fc)
 {
        struct mqueue_fs_context *ctx = fc->fs_private;
 
-       put_user_ns(fc->user_ns);
-       fc->user_ns = get_user_ns(ctx->ipc_ns->user_ns);
        fc->s_fs_info = ctx->ipc_ns;
        return vfs_get_super(fc, vfs_get_keyed_super, mqueue_fill_super);
 }
@@ -374,8 +372,7 @@ static void mqueue_fs_context_free(struct fs_context *fc)
 {
        struct mqueue_fs_context *ctx = fc->fs_private;
 
-       if (ctx->ipc_ns)
-               put_ipc_ns(ctx->ipc_ns);
+       put_ipc_ns(ctx->ipc_ns);
        kfree(ctx);
 }
 
@@ -388,6 +385,8 @@ static int mqueue_init_fs_context(struct fs_context *fc)
                return -ENOMEM;
 
        ctx->ipc_ns = get_ipc_ns(current->nsproxy->ipc_ns);
+       put_user_ns(fc->user_ns);
+       fc->user_ns = get_user_ns(ctx->ipc_ns->user_ns);
        fc->fs_private = ctx;
        fc->ops = &mqueue_fs_context_ops;
        return 0;
@@ -406,6 +405,8 @@ static struct vfsmount *mq_create_mount(struct ipc_namespace *ns)
        ctx = fc->fs_private;
        put_ipc_ns(ctx->ipc_ns);
        ctx->ipc_ns = get_ipc_ns(ns);
+       put_user_ns(fc->user_ns);
+       fc->user_ns = get_user_ns(ctx->ipc_ns->user_ns);
 
        mnt = fc_mount(fc);
        put_fs_context(fc);