leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pNFS/flexfiles: Fix an XDR encoding bug in layoutreturn

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

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: stable@vger.kernel.org # 4.0+
This commit is contained in:
Trond Myklebust
2016-01-21 15:39:40 -05:00
parent b819ed4b2a
commit 082fa37d13
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfs/flexfilelayout/flexfilelayout.c
View File

@@ -1859,11 +1859,9 @@ ff_layout_encode_layoutreturn(struct pnfs_layout_hdr *lo,
start = xdr_reserve_space(xdr, 4); start = xdr_reserve_space(xdr, 4);
BUG_ON(!start); BUG_ON(!start);
if (ff_layout_encode_ioerr(flo, xdr, args)) ff_layout_encode_ioerr(flo, xdr, args);
goto out;
ff_layout_encode_iostats(flo, xdr, args); ff_layout_encode_iostats(flo, xdr, args);
out:
*start = cpu_to_be32((xdr->p - start - 1) * 4); *start = cpu_to_be32((xdr->p - start - 1) * 4);
dprintk("%s: Return\n", __func__); dprintk("%s: Return\n", __func__);
} }