cifs: fix in logging in cifs_chan_update_iface

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>

diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c
index 2d3b332a79a1647c6cd5de78a2a91f15917e42c5..a16e175731eb3b5b76d0472bcefd695bac30c968 100644 (file)
--- a/fs/smb/client/sess.c
+++ b/fs/smb/client/sess.c
@@ -440,8 +440,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 0;
        }
@@ -459,10 +465,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 */
                if (iface) {