Commit 516eea97 authored by Shyam Prasad N's avatar Shyam Prasad N Committed by Steve French
Browse files

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: default avatarShyam Prasad N <sprasad@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 9c38568a

fs/smb/client/sess.c

+8 −6
Original line number Diff line number Diff line
@@ -440,8 +440,14 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server) 
	}



	if (!iface) {

		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) {