On Fri, Jan 22, 2016 at 9:38 AM, Anna Schumaker <Anna.Schumaker@xxxxxxxxxx> wrote: > > Hi Trond, > > On 01/21/2016 03:55 PM, Trond Myklebust wrote: > > We must not skip encoding the statistics, or the server will see an > > XDR encoding error. > > > > Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> > > Cc: stable@xxxxxxxxxxxxxxx # 4.0+ > > --- > > fs/nfs/flexfilelayout/flexfilelayout.c | 4 +--- > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c > > index 405f46ba490e..82959409b9a6 100644 > > --- a/fs/nfs/flexfilelayout/flexfilelayout.c > > +++ b/fs/nfs/flexfilelayout/flexfilelayout.c > > @@ -1859,9 +1859,7 @@ 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; > > Can you remove the label "out", too? GCC tells me: > > fs/nfs/flexfilelayout/flexfilelayout.c:1953:1: error: label 'out' defined but not used [-Werror=unused-label] > I intended to do this, but it slipped my mind. Done now... Apologies Trond -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
