Received-SPF: pass (google.com: domain of linux-kernel+bounces-20381-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>
In-Reply-To: <eac139a7-76d4-4067-8c25-15e30692aaf9@moroto.mountain>
From: Steve French <smfrench@gmail.com>
Date: Mon, 8 Jan 2024 22:42:10 -0600
Message-ID: <CAH2r5mt5FhiU15UL62JfferJG_AfF4iw6nd96PnEusWPF40AEQ@mail.gmail.com>
Subject: Re: [PATCH 2/3] cifs: make cifs_chan_update_iface() a void function
To: Dan Carpenter <dan.carpenter@linaro.org>
Cc: 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: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

merged into cifs-2.6.git for-next

On Mon, Jan 8, 2024 at 3:08=E2=80=AFAM Dan Carpenter <dan.carpenter@linaro.=
org> wrote:
>
> 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 *ser=
ver);
>  int
>  SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon, =
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 *ses=
)
>
>  /*
>   * 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 *ser=
ver)
>  {
>         unsigned int chan_index;
> @@ -368,20 +367,19 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct=
 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 T=
CP_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 T=
CP_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 T=
CP_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, struct=
 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;
>  }
>
>  /*
> --
> 2.42.0
>
>


--=20
Thanks,

Steve