Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed53c151 authored by Olga Kornievskaia's avatar Olga Kornievskaia Committed by Greg Kroah-Hartman
Browse files

NFSv4.1: fix SP4_MACH_CRED protection for pnfs IO 



[ Upstream commit 5cc7688bae7f0757c39c1d3dfdd827b724061067 ]

If the client is doing pnfs IO and Kerberos is configured and EXCHANGEID
successfully negotiated SP4_MACH_CRED and WRITE/COMMIT are on the
list of state protected operations, then we need to make sure to
choose the DS's rpc_client structure instead of the MDS's one.

Fixes: fb91fb0e ("NFS: Move call to nfs4_state_protect_write() to nfs4_write_setup()")
Signed-off-by: default avatarOlga Kornievskaia <kolga@netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fe449f8b

fs/nfs/nfs4proc.c

+3 −2
Original line number Diff line number Diff line
@@ -5369,7 +5369,7 @@ static void nfs4_proc_write_setup(struct nfs_pgio_header *hdr, 


	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_WRITE];

	nfs4_init_sequence(&hdr->args.seq_args, &hdr->res.seq_res, 0, 0);

	nfs4_state_protect_write(server->nfs_client, clnt, msg, hdr);

	nfs4_state_protect_write(hdr->ds_clp ? hdr->ds_clp : server->nfs_client, clnt, msg, hdr);

}



static void nfs4_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commit_data *data)
@@ -5410,7 +5410,8 @@ static void nfs4_proc_commit_setup(struct nfs_commit_data *data, struct rpc_mess 
	data->res.server = server;

	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_COMMIT];

	nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 1, 0);

	nfs4_state_protect(server->nfs_client, NFS_SP4_MACH_CRED_COMMIT, clnt, msg);

	nfs4_state_protect(data->ds_clp ? data->ds_clp : server->nfs_client,

			NFS_SP4_MACH_CRED_COMMIT, clnt, msg);

}



static int _nfs4_proc_commit(struct file *dst, struct nfs_commitargs *args,