2021-05-13 15:17:41

by Colin King

Subject: [PATCH] nfsd: remove redundant assignment to pointer 'this'

From: Colin Ian King <[email protected]>

The pointer 'this' is being initialized with a value that is never read
and it is being updated later with a new value. The initialization is
redundant and can be removed.

Addresses-Coverity: ("Unused value")
Signed-off-by: Colin Ian King <[email protected]>
---
fs/nfsd/nfs4proc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index f4ce93d7f26e..712df4b7dcb2 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -3232,7 +3232,7 @@ bool nfsd4_spo_must_allow(struct svc_rqst *rqstp)
{
struct nfsd4_compoundres *resp = rqstp->rq_resp;
struct nfsd4_compoundargs *argp = rqstp->rq_argp;
- struct nfsd4_op *this = &argp->ops[resp->opcnt - 1];
+ struct nfsd4_op *this;
struct nfsd4_compound_state *cstate = &resp->cstate;
struct nfs4_op_map *allow = &cstate->clp->cl_spo_must_allow;
u32 opiter;
--
2.30.2

2021-06-25 14:55:17

by J. Bruce Fields

Subject: Re: [PATCH] nfsd: remove redundant assignment to pointer 'this'

Sorry, overlooked this before somehow; applied for 5.14.--b.

On Thu, May 13, 2021 at 04:16:39PM +0100, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> The pointer 'this' is being initialized with a value that is never read
> and it is being updated later with a new value. The initialization is
> redundant and can be removed.
>
> Addresses-Coverity: ("Unused value")
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> fs/nfsd/nfs4proc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index f4ce93d7f26e..712df4b7dcb2 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -3232,7 +3232,7 @@ bool nfsd4_spo_must_allow(struct svc_rqst *rqstp)
> {
> struct nfsd4_compoundres *resp = rqstp->rq_resp;
> struct nfsd4_compoundargs *argp = rqstp->rq_argp;
> - struct nfsd4_op *this = &argp->ops[resp->opcnt - 1];
> + struct nfsd4_op *this;
> struct nfsd4_compound_state *cstate = &resp->cstate;
> struct nfs4_op_map *allow = &cstate->clp->cl_spo_must_allow;
> u32 opiter;
> --
> 2.30.2