Merge branch 'for-5.14/dax' into libnvdimm-fixes

[linux-2.6-microblaze.git] / fs / nfs / nfs4idmap.c

diff --git a/fs/nfs/nfs4idmap.c b/fs/nfs/nfs4idmap.c
index 62e6eea..8d8aba3 100644 (file)
--- a/fs/nfs/nfs4idmap.c
+++ b/fs/nfs/nfs4idmap.c
@@ -46,6 +46,7 @@
 #include <keys/user-type.h>
 #include <keys/request_key_auth-type.h>
 #include <linux/module.h>
+#include <linux/user_namespace.h>
 
 #include "internal.h"
 #include "netns.h"
@@ -69,13 +70,13 @@ struct idmap {
        struct rpc_pipe         *idmap_pipe;
        struct idmap_legacy_upcalldata *idmap_upcall_data;
        struct mutex            idmap_mutex;
-       const struct cred       *cred;
+       struct user_namespace   *user_ns;
 };
 
 static struct user_namespace *idmap_userns(const struct idmap *idmap)
 {
-       if (idmap && idmap->cred)
-               return idmap->cred->user_ns;
+       if (idmap && idmap->user_ns)
+               return idmap->user_ns;
        return &init_user_ns;
 }
 
@@ -286,7 +287,7 @@ static struct key *nfs_idmap_request_key(const char *name, size_t namelen,
        if (ret < 0)
                return ERR_PTR(ret);
 
-       if (!idmap->cred || idmap->cred->user_ns == &init_user_ns)
+       if (!idmap->user_ns || idmap->user_ns == &init_user_ns)
                rkey = request_key(&key_type_id_resolver, desc, "");
        if (IS_ERR(rkey)) {
                mutex_lock(&idmap->idmap_mutex);
@@ -462,7 +463,7 @@ nfs_idmap_new(struct nfs_client *clp)
                return -ENOMEM;
 
        mutex_init(&idmap->idmap_mutex);
-       idmap->cred = get_cred(clp->cl_rpcclient->cl_cred);
+       idmap->user_ns = get_user_ns(clp->cl_rpcclient->cl_cred->user_ns);
 
        rpc_init_pipe_dir_object(&idmap->idmap_pdo,
                        &nfs_idmap_pipe_dir_object_ops,
@@ -486,7 +487,7 @@ nfs_idmap_new(struct nfs_client *clp)
 err_destroy_pipe:
        rpc_destroy_pipe_data(idmap->idmap_pipe);
 err:
-       put_cred(idmap->cred);
+       get_user_ns(idmap->user_ns);
        kfree(idmap);
        return error;
 }
@@ -503,7 +504,7 @@ nfs_idmap_delete(struct nfs_client *clp)
                        &clp->cl_rpcclient->cl_pipedir_objects,
                        &idmap->idmap_pdo);
        rpc_destroy_pipe_data(idmap->idmap_pipe);
-       put_cred(idmap->cred);
+       put_user_ns(idmap->user_ns);
        kfree(idmap);
 }