Re: [PATCH 34/36] smb: client: remove conditional return with no effect

[Steve French]

I have now merged it into my tree (cifs-2.6.git for-next)

On Fri, Jul 24, 2026 at 12:12 PM Sang-Heon Jeon <ekffu200098@xxxxxxxxx> wrote:
>
> Hello,
>
> On Fri, Jul 24, 2026 at 5:27 AM Steve French <smfrench@xxxxxxxxx> wrote:
> >
> > You can add my Reviewed-by if it is not going through my tree.
> >
> > Which tree do you want this changeset to go through?
>
> I don't have a strong preference. But some patches in this series have
> already been picked up by their subsystem trees, and I'm planning to
> send v2 that fixes several issues and addresses feedback.
>
> So could you take this patch through the cifs tree? Then I will
> happily drop this patch from v2.
>
> > On Thu, Jul 23, 2026 at 2:04 PM Sang-Heon Jeon <ekffu200098@xxxxxxxxx> wrote:
> > >
> > > Both branches of the check return the same value, so the check has
> > > no effect. Remove it and return the value directly.
> > >
> > > This is the result of running the Coccinelle script from
> > > scripts/coccinelle/misc/cond_return_no_effect.cocci.
> > >
> > > Signed-off-by: Sang-Heon Jeon <ekffu200098@xxxxxxxxx>
> > > ---
> > >  fs/smb/client/smb1maperror.c | 6 +-----
> > >  1 file changed, 1 insertion(+), 5 deletions(-)
> > >
> > > diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
> > > index ab3d09613c91..395299f9121b 100644
> > > --- a/fs/smb/client/smb1maperror.c
> > > +++ b/fs/smb/client/smb1maperror.c
> > > @@ -234,11 +234,7 @@ int __init smb1_init_maperror(void)
> > >         if (rc)
> > >                 return rc;
> > >
> > > -       rc = mapping_table_ERRSRV_is_sorted();
> > > -       if (rc)
> > > -               return rc;
> > > -
> > > -       return rc;
> > > +       return mapping_table_ERRSRV_is_sorted();
> > >  }
> > >
> > >  #if IS_ENABLED(CONFIG_SMB1_KUNIT_TESTS)
> > > --
> > > 2.43.0
> > >
> > >
> >
> >
> > --
> > Thanks,
> >
> > Steve
>
> Thanks for reviewing.
>
> Best Regards,
> Sang-Heon Jeon



-- 
Thanks,

Steve