cifs: delete unnecessary NULL checks in cifs_chan_update_iface()

[ Upstream commit c3a11c0ec66c1e0652e3a2bb4f5cc74eea0ba486 ]

We return early if "iface" is NULL so there is no need to check here.
Delete those checks.

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/sess.c b/fs/smb/client/sess.c
index 94c5d50aa3474dc9f43cefae26898775a431bf69..0c2ac8d929a26d0edf2b5389d49b61f15ba7970a 100644 (file)
--- a/fs/smb/client/sess.c
+++ b/fs/smb/client/sess.c
@@ -472,27 +472,23 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
                kref_put(&old_iface->refcount, release_iface);
        } else if (!chan_index) {
                /* special case: update interface for primary channel */
-               if (iface) {
-                       cifs_dbg(FYI, "referencing primary channel iface: %pIS\n",
-                                &iface->sockaddr);
-                       iface->num_channels++;
-                       iface->weight_fulfilled++;
-               }
+               cifs_dbg(FYI, "referencing primary channel iface: %pIS\n",
+                        &iface->sockaddr);
+               iface->num_channels++;
+               iface->weight_fulfilled++;
        }
        spin_unlock(&ses->iface_lock);
 
-       if (iface) {
-               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;
-               }
-
-               ses->chans[chan_index].iface = iface;
+       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;
        }
 
+       ses->chans[chan_index].iface = iface;
+       spin_unlock(&ses->chan_lock);
+
        return rc;
 }