2015-11-21 10:29:04

by Dan Carpenter

Subject: [patch] nfsd: fix a warning message

The WARN() macro takes a condition and a format string. The condition
was accidentally left out here so it just prints the function name
instead of the message.

Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 6b800b5..7af023f 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2240,7 +2240,8 @@ nfsd4_store_cache_entry(struct nfsd4_compoundres *resp)
base = resp->cstate.data_offset;
slot->sl_datalen = buf->len - base;
if (read_bytes_from_xdr_buf(buf, base, slot->sl_data, slot->sl_datalen))
- WARN("%s: sessions DRC could not cache compound\n", __func__);
+ WARN(1, "%s: sessions DRC could not cache compound\n",
+ __func__);
return;
}

2015-11-22 13:04:22

by Jeff Layton

Subject: Re: [patch] nfsd: fix a warning message

On Sat, 21 Nov 2015 13:28:50 +0300
Dan Carpenter <[email protected]> wrote:

> The WARN() macro takes a condition and a format string. The condition
> was accidentally left out here so it just prints the function name
> instead of the message.
>
> Signed-off-by: Dan Carpenter <[email protected]>
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 6b800b5..7af023f 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -2240,7 +2240,8 @@ nfsd4_store_cache_entry(struct nfsd4_compoundres *resp)
> base = resp->cstate.data_offset;
> slot->sl_datalen = buf->len - base;
> if (read_bytes_from_xdr_buf(buf, base, slot->sl_data, slot->sl_datalen))
> - WARN("%s: sessions DRC could not cache compound\n", __func__);
> + WARN(1, "%s: sessions DRC could not cache compound\n",
> + __func__);
> return;
> }
>

Reviewed-by: Jeff Layton <[email protected]>

2015-11-23 19:05:35

by J. Bruce Fields

Subject: Re: [patch] nfsd: fix a warning message

On Sun, Nov 22, 2015 at 08:04:18AM -0500, Jeff Layton wrote:
> On Sat, 21 Nov 2015 13:28:50 +0300
> Dan Carpenter <[email protected]> wrote:

Thanks, applying for 4.5.--b.

>
> > The WARN() macro takes a condition and a format string. The condition
> > was accidentally left out here so it just prints the function name
> > instead of the message.
> >
> > Signed-off-by: Dan Carpenter <[email protected]>
> >
> > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> > index 6b800b5..7af023f 100644
> > --- a/fs/nfsd/nfs4state.c
> > +++ b/fs/nfsd/nfs4state.c
> > @@ -2240,7 +2240,8 @@ nfsd4_store_cache_entry(struct nfsd4_compoundres *resp)
> > base = resp->cstate.data_offset;
> > slot->sl_datalen = buf->len - base;
> > if (read_bytes_from_xdr_buf(buf, base, slot->sl_data, slot->sl_datalen))
> > - WARN("%s: sessions DRC could not cache compound\n", __func__);
> > + WARN(1, "%s: sessions DRC could not cache compound\n",
> > + __func__);
> > return;
> > }
> >
>
> Reviewed-by: Jeff Layton <[email protected]>