Merge branch 'linux-5.15.88-mpi' into linux-5.15.89-mpi

* linux-5.15.88-mpi: nfs: Do not try to use idmap for sec=mariux
mariux64 · Jan 18, 2023 · 00a15cb · 00a15cb
2 parents fdfa60a + 5665b35
commit 00a15cb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
@@ -1089,8 +1089,9 @@ static int nfs4_server_common_setup(struct nfs_server *server,
 	 * Don't use NFS uid/gid mapping if we're using AUTH_SYS or lower
 	 * authentication.
 	 */
-	if (nfs4_disable_idmapping &&
-			server->client->cl_auth->au_flavor == RPC_AUTH_UNIX)
+	if (nfs4_disable_idmapping && (
+			server->client->cl_auth->au_flavor == RPC_AUTH_UNIX
+			|| server->client->cl_auth->au_flavor == RPC_AUTH_MARIUX ))
 		server->caps |= NFS_CAP_UIDGID_NOMAP;