| Message ID | 0cce4257-6c22-4c0a-b769-b946990413fe@moroto.mountain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | nfsd: remove unnecessary NULL check | expand |
On Mon, 2023-12-04 at 15:30 +0300, Dan Carpenter wrote: > We check "state" for NULL on the previous line so it can't be NULL here. > No need to check again. > > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/r/202312031425.LffZTarR-lkp@intel.com/ > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > fs/nfsd/nfs4state.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 40415929e2ae..fb551a3db1dc 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -6639,7 +6639,7 @@ __be32 manage_cpntf_state(struct nfsd_net *nn, stateid_t *st, > spin_unlock(&nn->s2s_cp_lock); > if (!state) > return nfserr_bad_stateid; > - if (!clp && state) > + if (!clp) > *cps = state; > return 0; > } Reviewed-by: Jeff Layton <jlayton@kernel.org>
On Mon, Dec 04, 2023 at 03:30:06PM +0300, Dan Carpenter wrote: > We check "state" for NULL on the previous line so it can't be NULL here. > No need to check again. > > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/r/202312031425.LffZTarR-lkp@intel.com/ > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> LGTM. Applied to nfsd-next for v6.8. > --- > fs/nfsd/nfs4state.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 40415929e2ae..fb551a3db1dc 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -6639,7 +6639,7 @@ __be32 manage_cpntf_state(struct nfsd_net *nn, stateid_t *st, > spin_unlock(&nn->s2s_cp_lock); > if (!state) > return nfserr_bad_stateid; > - if (!clp && state) > + if (!clp) > *cps = state; > return 0; > } > -- > 2.42.0 >
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 40415929e2ae..fb551a3db1dc 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -6639,7 +6639,7 @@ __be32 manage_cpntf_state(struct nfsd_net *nn, stateid_t *st, spin_unlock(&nn->s2s_cp_lock); if (!state) return nfserr_bad_stateid; - if (!clp && state) + if (!clp) *cps = state; return 0; }
We check "state" for NULL on the previous line so it can't be NULL here. No need to check again. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/r/202312031425.LffZTarR-lkp@intel.com/ Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- fs/nfsd/nfs4state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)