Received-SPF: pass (google.com: domain of linux-kernel+bounces-20380-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Precedence: bulk
MIME-Version: 1.0
References: <b628a706-d356-4629-a433-59dfda24bb94@moroto.mountain>
 <eac139a7-76d4-4067-8c25-15e30692aaf9@moroto.mountain> <4c6b12c9-0502-400a-b2ba-dad89ef4f652@wanadoo.fr>
In-Reply-To: <4c6b12c9-0502-400a-b2ba-dad89ef4f652@wanadoo.fr>
From: Steve French <smfrench@gmail.com>
Date: Mon, 8 Jan 2024 22:41:35 -0600
Message-ID: <CAH2r5mu0BnSuOcbG9L=Y0Hhe6GAtOxUJ1R4wkVmXn7A-Vgxndw@mail.gmail.com>
Subject: Re: [PATCH 2/3] cifs: make cifs_chan_update_iface() a void function
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Dan Carpenter <dan.carpenter@linaro.org>, Steve French <sfrench@samba.org>, 
	Paulo Alcantara <pc@manguebit.com>, Ronnie Sahlberg <lsahlber@redhat.com>, 
	Shyam Prasad N <sprasad@microsoft.com>, Tom Talpey <tom@talpey.com>, linux-cifs@vger.kernel.org, 
	samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, 
	kernel-janitors@vger.kernel.org
Content-Type: multipart/mixed; boundary="00000000000096091d060e7beea4"

--00000000000096091d060e7beea4
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

added the trivial change Christophe Suggested


On Mon, Jan 8, 2024 at 1:09=E2=80=AFPM Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
>
> Le 08/01/2024 =C3=A0 10:08, Dan Carpenter a =C3=A9crit :
> > The return values for cifs_chan_update_iface() didn't match what the
> > documentation said and nothing was checking them anyway.  Just make it
> > a void function.
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> > ---
> >   fs/smb/client/cifsproto.h |  2 +-
> >   fs/smb/client/sess.c      | 17 +++++++----------
> >   2 files changed, 8 insertions(+), 11 deletions(-)
> >
> > diff --git a/fs/smb/client/cifsproto.h b/fs/smb/client/cifsproto.h
> > index afbab86331a1..a841bf4967fa 100644
> > --- a/fs/smb/client/cifsproto.h
> > +++ b/fs/smb/client/cifsproto.h
> > @@ -656,7 +656,7 @@ cifs_chan_is_iface_active(struct cifs_ses *ses,
> >                         struct TCP_Server_Info *server);
> >   void
> >   cifs_disable_secondary_channels(struct cifs_ses *ses);
> > -int
> > +void
> >   cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *=
server);
> >   int
> >   SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tco=
n, bool in_mount);
> > diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c
> > index 775c6a4a2f4b..f7b216dd06b2 100644
> > --- a/fs/smb/client/sess.c
> > +++ b/fs/smb/client/sess.c
> > @@ -356,10 +356,9 @@ cifs_disable_secondary_channels(struct cifs_ses *s=
es)
> >
> >   /*
> >    * update the iface for the channel if necessary.
> > - * will return 0 when iface is updated, 1 if removed, 2 otherwise
> >    * Must be called with chan_lock held.
> >    */
> > -int
> > +void
> >   cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *=
server)
> >   {
> >       unsigned int chan_index;
> > @@ -368,20 +367,19 @@ cifs_chan_update_iface(struct cifs_ses *ses, stru=
ct TCP_Server_Info *server)
> >       struct cifs_server_iface *old_iface =3D NULL;
> >       struct cifs_server_iface *last_iface =3D NULL;
> >       struct sockaddr_storage ss;
> > -     int rc =3D 0;
> >
> >       spin_lock(&ses->chan_lock);
> >       chan_index =3D cifs_ses_get_chan_index(ses, server);
> >       if (chan_index =3D=3D CIFS_INVAL_CHAN_INDEX) {
> >               spin_unlock(&ses->chan_lock);
> > -             return 0;
> > +             return;
> >       }
> >
> >       if (ses->chans[chan_index].iface) {
> >               old_iface =3D ses->chans[chan_index].iface;
> >               if (old_iface->is_active) {
> >                       spin_unlock(&ses->chan_lock);
> > -                     return 1;
> > +                     return;
> >               }
> >       }
> >       spin_unlock(&ses->chan_lock);
> > @@ -394,7 +392,7 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct=
 TCP_Server_Info *server)
> >       if (!ses->iface_count) {
> >               spin_unlock(&ses->iface_lock);
> >               cifs_dbg(VFS, "server %s does not advertise interfaces\n"=
, ses->server->hostname);
> > -             return 0;
> > +             return;
> >       }
> >
> >       last_iface =3D list_last_entry(&ses->iface_list, struct cifs_serv=
er_iface,
> > @@ -434,7 +432,6 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct=
 TCP_Server_Info *server)
> >       }
> >
> >       if (list_entry_is_head(iface, &ses->iface_list, iface_head)) {
> > -             rc =3D 1;
> >               iface =3D NULL;
> >               cifs_dbg(FYI, "unable to find a suitable iface\n");
> >       }
> > @@ -449,7 +446,7 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct=
 TCP_Server_Info *server)
> >               }
> >
> >               spin_unlock(&ses->iface_lock);
> > -             return 0;
> > +             return;
> >       }
> >
> >       /* now drop the ref to the current iface */
> > @@ -478,13 +475,13 @@ cifs_chan_update_iface(struct cifs_ses *ses, stru=
ct TCP_Server_Info *server)
> >       chan_index =3D cifs_ses_get_chan_index(ses, server);
> >       if (chan_index =3D=3D CIFS_INVAL_CHAN_INDEX) {
> >               spin_unlock(&ses->chan_lock);
> > -             return 0;
> > +             return;
> >       }
> >
> >       ses->chans[chan_index].iface =3D iface;
> >       spin_unlock(&ses->chan_lock);
> >
> > -     return rc;
> > +     return;
>
> just remove this one?
>
> CJ
>
> >   }
> >
> >   /*
>
>


--=20
Thanks,

Steve

--00000000000096091d060e7beea4
Content-Type: text/x-patch; charset="US-ASCII"; 
	name="0017-cifs-remove-unneeded-return-statement.patch"
Content-Disposition: attachment; 
	filename="0017-cifs-remove-unneeded-return-statement.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_lr5v6ymp0>
X-Attachment-Id: f_lr5v6ymp0

RnJvbSBhM2Y3NjNmZGNiMmY3ODRjMzU1YWVkNjZkZGFjNjc0OGZmOGRiZmE2IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGV2ZSBGcmVuY2ggPHN0ZnJlbmNoQG1pY3Jvc29mdC5jb20+
CkRhdGU6IE1vbiwgOCBKYW4gMjAyNCAyMjozNzoxMCAtMDYwMApTdWJqZWN0OiBbUEFUQ0ggMTcv
MTddIGNpZnM6IHJlbW92ZSB1bm5lZWRlZCByZXR1cm4gc3RhdGVtZW50CgpSZXR1cm4gc3RhdGVt
ZW50IHdhcyBub3QgbmVlZGVkIGF0IGVuZCBvZiBjaWZzX2NoYW5fdXBkYXRlX2lmYWNlCgpTdWdn
ZXN0ZWQtYnk6IENocmlzdG9waGUgSmFpbGxldCA8Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28u
ZnI+ClNpZ25lZC1vZmYtYnk6IFN0ZXZlIEZyZW5jaCA8c3RmcmVuY2hAbWljcm9zb2Z0LmNvbT4K
LS0tCiBmcy9zbWIvY2xpZW50L3Nlc3MuYyB8IDIgLS0KIDEgZmlsZSBjaGFuZ2VkLCAyIGRlbGV0
aW9ucygtKQoKZGlmZiAtLWdpdCBhL2ZzL3NtYi9jbGllbnQvc2Vzcy5jIGIvZnMvc21iL2NsaWVu
dC9zZXNzLmMKaW5kZXggZjdiMjE2ZGQwNmIyLi5jZGU4MTA0MmJlYmQgMTAwNjQ0Ci0tLSBhL2Zz
L3NtYi9jbGllbnQvc2Vzcy5jCisrKyBiL2ZzL3NtYi9jbGllbnQvc2Vzcy5jCkBAIC00ODAsOCAr
NDgwLDYgQEAgY2lmc19jaGFuX3VwZGF0ZV9pZmFjZShzdHJ1Y3QgY2lmc19zZXMgKnNlcywgc3Ry
dWN0IFRDUF9TZXJ2ZXJfSW5mbyAqc2VydmVyKQogCiAJc2VzLT5jaGFuc1tjaGFuX2luZGV4XS5p
ZmFjZSA9IGlmYWNlOwogCXNwaW5fdW5sb2NrKCZzZXMtPmNoYW5fbG9jayk7Ci0KLQlyZXR1cm47
CiB9CiAKIC8qCi0tIAoyLjQwLjEKCg==
--00000000000096091d060e7beea4--