[PATCH v2] Staging: lustre: lmv_obd: Remove redundant if-statement.

[PATCH v2] Staging: lustre: lmv_obd: Remove redundant if-statement.

[Sandhya Bankar]

Remove redundant if-statement.

Signed-off-by: Sandhya Bankar <bankarsandhya512@gmail.com>
---
Changes in v2:
* Correcting the file permission issue.
 drivers/staging/lustre/lustre/lmv/lmv_obd.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index 5783359..0713e55 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -949,10 +949,8 @@ static int lmv_hsm_ct_register(struct lmv_obd *lmv, unsigned int cmd, int len,
 
 	rc = libcfs_kkuc_group_add(filp, lk->lk_uid, lk->lk_group,
 				   &kcd, sizeof(kcd));
-	if (rc) {
-		if (filp)
-			fput(filp);
-	}
+	if (rc && filp)
+		fput(filp);
 
 	return rc;
 }
-- 
1.7.1

Re: [PATCH v2] Staging: lustre: lmv_obd: Remove redundant if-statement.

[sandhya bankar]

[-- Attachment #1: Type: text/plain, Size: 1499 bytes --]

Thanks Andreas ! I will send a patch with your suggestion.

On Mon, Sep 19, 2016 at 3:17 AM, Dilger, Andreas <andreas.dilger@intel.com>
wrote:

> On Sep 18, 2016, at 00:59, Sandhya Bankar <bankarsandhya512@gmail.com>
> wrote:
> >
> > Remove redundant if-statement.
> >
> > Signed-off-by: Sandhya Bankar <bankarsandhya512@gmail.com>
> > ---
> > Changes in v2:
> > * Correcting the file permission issue.
> > drivers/staging/lustre/lustre/lmv/lmv_obd.c |    6 ++----
> > 1 files changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
> b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
> > index 5783359..0713e55 100644
> > --- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
> > +++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
> > @@ -949,10 +949,8 @@ static int lmv_hsm_ct_register(struct lmv_obd *lmv,
> unsigned int cmd, int len,
> >
> >       rc = libcfs_kkuc_group_add(filp, lk->lk_uid, lk->lk_group,
> >                                  &kcd, sizeof(kcd));
> > -     if (rc) {
> > -             if (filp)
> > -                     fput(filp);
> > -     }
> > +     if (rc && filp)
> > +             fput(filp);
>
> In fact, the check for filp != NULL is also redundant.  A few lines
> earlier:
>
>         /* at least one registration done, with no failure */
>         filp = fget(lk->lk_wfd);
>         if (!filp)
>                 return -EBADF;
>
> so it cannot be NULL at this point, and the check should just be removed.
>
> Cheers, Andreas

[-- Attachment #2: Type: text/html, Size: 2226 bytes --]