Commit 91f4480c authored by Shyam Prasad N's avatar Shyam Prasad N Committed by Steve French

cifs: fix status checks in cifs_tree_connect

The ordering of status checks at the beginning of
cifs_tree_connect is wrong. As a result, a tcon
which is good may stay marked as needing reconnect
infinitely.

Fixes: 2f0e4f03 ("cifs: check only tcon status on tcon related functions")
Cc: stable@vger.kernel.org # 6.3
Signed-off-by: default avatarShyam Prasad N <sprasad@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent a5998a9e
...@@ -4086,16 +4086,17 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru ...@@ -4086,16 +4086,17 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru
/* only send once per connect */ /* only send once per connect */
spin_lock(&tcon->tc_lock); spin_lock(&tcon->tc_lock);
if (tcon->status == TID_GOOD) {
spin_unlock(&tcon->tc_lock);
return 0;
}
if (tcon->status != TID_NEW && if (tcon->status != TID_NEW &&
tcon->status != TID_NEED_TCON) { tcon->status != TID_NEED_TCON) {
spin_unlock(&tcon->tc_lock); spin_unlock(&tcon->tc_lock);
return -EHOSTDOWN; return -EHOSTDOWN;
} }
if (tcon->status == TID_GOOD) {
spin_unlock(&tcon->tc_lock);
return 0;
}
tcon->status = TID_IN_TCON; tcon->status = TID_IN_TCON;
spin_unlock(&tcon->tc_lock); spin_unlock(&tcon->tc_lock);
......
...@@ -575,16 +575,17 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru ...@@ -575,16 +575,17 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru
/* only send once per connect */ /* only send once per connect */
spin_lock(&tcon->tc_lock); spin_lock(&tcon->tc_lock);
if (tcon->status == TID_GOOD) {
spin_unlock(&tcon->tc_lock);
return 0;
}
if (tcon->status != TID_NEW && if (tcon->status != TID_NEW &&
tcon->status != TID_NEED_TCON) { tcon->status != TID_NEED_TCON) {
spin_unlock(&tcon->tc_lock); spin_unlock(&tcon->tc_lock);
return -EHOSTDOWN; return -EHOSTDOWN;
} }
if (tcon->status == TID_GOOD) {
spin_unlock(&tcon->tc_lock);
return 0;
}
tcon->status = TID_IN_TCON; tcon->status = TID_IN_TCON;
spin_unlock(&tcon->tc_lock); spin_unlock(&tcon->tc_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment