cifs: make cifs_chan_update_iface() a void function

[ Upstream commit 8d606c311b75e81063b4ea650b301cbe0c4ed5e1 ]

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>
Signed-off-by: Steve French <stfrench@microsoft.com>
Stable-dep-of: 16a57d768111 ("cifs: reduce warning log level for server not advertising interfaces")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/smb/client/cifsproto.h b/fs/smb/client/cifsproto.h
index 6945551ea166d445d01037da401b6c613f21ec79..13131957d96167eec101f57d080794cd8e74bed2 100644 (file)
--- a/fs/smb/client/cifsproto.h
+++ b/fs/smb/client/cifsproto.h
@@ -654,7 +654,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 *tcon, bool in_mount);

diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c
index 0c2ac8d929a26d0edf2b5389d49b61f15ba7970a..f8f4e7fc05daeb97c1ce761f750e68ea68370fe8 100644 (file)
--- a/fs/smb/client/sess.c
+++ b/fs/smb/client/sess.c
@@ -361,10 +361,9 @@ done:
 
 /*
  * 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;
@@ -373,20 +372,19 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
        struct cifs_server_iface *old_iface = NULL;
        struct cifs_server_iface *last_iface = NULL;
        struct sockaddr_storage ss;
-       int rc = 0;
 
        spin_lock(&ses->chan_lock);
        chan_index = cifs_ses_get_chan_index(ses, server);
        if (chan_index == CIFS_INVAL_CHAN_INDEX) {
                spin_unlock(&ses->chan_lock);
-               return 0;
+               return;
        }
 
        if (ses->chans[chan_index].iface) {
                old_iface = ses->chans[chan_index].iface;
                if (old_iface->is_active) {
                        spin_unlock(&ses->chan_lock);
-                       return 1;
+                       return;
                }
        }
        spin_unlock(&ses->chan_lock);
@@ -399,7 +397,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 = list_last_entry(&ses->iface_list, struct cifs_server_iface,
@@ -439,7 +437,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 = 1;
                iface = NULL;
                cifs_dbg(FYI, "unable to find a suitable iface\n");
        }
@@ -454,7 +451,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 */
@@ -483,13 +480,13 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
        chan_index = cifs_ses_get_chan_index(ses, server);
        if (chan_index == CIFS_INVAL_CHAN_INDEX) {
                spin_unlock(&ses->chan_lock);
-               return 0;
+               return;
        }
 
        ses->chans[chan_index].iface = iface;
        spin_unlock(&ses->chan_lock);
 
-       return rc;
+       return;
 }
 
 /*