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

Commit 082fa37d authored by Trond Myklebust's avatar Trond Myklebust
Browse files

pNFS/flexfiles: Fix an XDR encoding bug in layoutreturn 



We must not skip encoding the statistics, or the server will see an
XDR encoding error.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Cc: stable@vger.kernel.org # 4.0+
parent b819ed4b

fs/nfs/flexfilelayout/flexfilelayout.c

+2 −4
Original line number Diff line number Diff line
@@ -1859,11 +1859,9 @@ ff_layout_encode_layoutreturn(struct pnfs_layout_hdr *lo, 
	start = xdr_reserve_space(xdr, 4);

	BUG_ON(!start);



	if (ff_layout_encode_ioerr(flo, xdr, args))

		goto out;



	ff_layout_encode_ioerr(flo, xdr, args);

	ff_layout_encode_iostats(flo, xdr, args);

out:



	*start = cpu_to_be32((xdr->p - start - 1) * 4);

	dprintk("%s: Return\n", __func__);

}