Commit ca857cc1 authored Jun 28, 2016 by Trond Myklebust

NFS/pnfs: Do not clobber existing pgio_done_cb in nfs4_proc_read_setup



If a pNFS client sets hdr->pgio_done_cb, then we should not overwrite that
in nfs4_proc_read_setup()

Fixes: 75bf47eb ("pNFS/flexfile: Fix erroneous fall back to...")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

parent 5c6e5b60

fs/nfs/nfs4proc.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -4392,6 +4392,7 @@ static void nfs4_proc_read_setup(struct nfs_pgio_header *hdr,
		struct rpc_message *msg)
		{
		hdr->timestamp = jiffies;
		if (!hdr->pgio_done_cb)
		hdr->pgio_done_cb = nfs4_read_done_cb;
		msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ];
		nfs4_init_sequence(&hdr->args.seq_args, &hdr->res.seq_res, 0);

Admin message