cifs: fix in logging in cifs_chan_update_iface

[ Upstream commit 516eea97f92f1e7271f20835cfe9e73774b0f8cc ]

Recently, cifs_chan_update_iface was modified to not
remove an iface if a suitable replacement was not found.
With that, there were two conditionals that were exactly
the same. This change removes that extra condition check.

Also, fixed a logging in the same function to indicate
the correct message.

Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c
index f3d25395d0d3cfb76288e94c1124c859d9a59118..5de32640f0265c128af44da647d042db7343c5ef 100644 (file)
--- a/fs/smb/client/sess.c
+++ b/fs/smb/client/sess.c
@@ -442,8 +442,14 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
        }
 
        if (!iface) {
-               cifs_dbg(FYI, "unable to get the interface matching: %pIS\n",
-                        &ss);
+               if (!chan_index)
+                       cifs_dbg(FYI, "unable to get the interface matching: %pIS\n",
+                                &ss);
+               else {
+                       cifs_dbg(FYI, "unable to find another interface to replace: %pIS\n",
+                                &old_iface->sockaddr);
+               }
+
                spin_unlock(&ses->iface_lock);
                return;
        }
@@ -461,10 +467,6 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
                iface->weight_fulfilled++;
 
                kref_put(&old_iface->refcount, release_iface);
-       } else if (old_iface) {
-               /* if a new candidate is not found, keep things as is */
-               cifs_dbg(FYI, "could not replace iface: %pIS\n",
-                        &old_iface->sockaddr);
        } else if (!chan_index) {
                /* special case: update interface for primary channel */
                cifs_dbg(FYI, "referencing primary channel iface: %pIS\n",