On Fri, Jan 19, 2018 at 11:15:33AM -0500, Chuck Lever wrote:
>
>
> > On Jan 19, 2018, at 9:54 AM, Arnd Bergmann <[email protected]> wrote:
> >
> > There is now only one caller left for svcxdr_dupstr() and this is inside
> > of an #ifdef, so we can get a warning when the option is disabled:
> >
> > fs/nfsd/nfs4xdr.c:241:1: error: 'svcxdr_dupstr' defined but not used
> > [-Werror=unused-function]
> >
> > This adds another #ifdef around the definition.
> >
> > Fixes: e40d99e6183e ("NFSD: Clean up symlink argument XDR decoders")
> > Signed-off-by: Arnd Bergmann <[email protected]>
>
> Seems OK to me, and sorry for the noise.
>
> Reviewed-by: Chuck Lever <[email protected]>
Thanks!
--b.
>
>
> > ---
> > fs/nfsd/nfs4xdr.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> > index f51c9cccaf78..374a62af6034 100644
> > --- a/fs/nfsd/nfs4xdr.c
> > +++ b/fs/nfsd/nfs4xdr.c
> > @@ -237,6 +237,7 @@ svcxdr_tmpalloc(struct nfsd4_compoundargs *argp, u32
> > len)
> > * Note null-terminating in place usually isn't safe since the
> > * buffer might end on a page boundary.
> > */
> > +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
> > static char *
> > svcxdr_dupstr(struct nfsd4_compoundargs *argp, void *buf, u32 len)
> > {
> > @@ -248,6 +249,7 @@ svcxdr_dupstr(struct nfsd4_compoundargs *argp, void
> > *buf, u32 len)
> > p[len] = '\0';
> > return p;
> > }
> > +#endif
> >
> > /**
> > * savemem - duplicate a chunk of memory for later processing
> > --
> > 2.9.0
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> > the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> --
> Chuck Lever
>
>
