aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2010-09-21 11:14:46 -0400
committerSteve French <sfrench@us.ibm.com>2010-09-29 15:04:31 -0400
commitab9db8b737210bec365593a04dd1c534220bb311 (patch)
tree09ea9395d7a54737c83f90e3558836d1ccbdd7c6 /fs/cifs
parent5fe97cfddc426f3145e8673b68faab7e54462173 (diff)
cifs: allow matching of tcp sessions in CifsNew state
With commit 7332f2a6217ee6925f83ef0e725013067ed316ba, cifsd will no longer exit when the socket abends and the tcpStatus is CifsNew. With that change, there's no reason to avoid matching an existing session in this state. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/connect.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 435b912f5de5..271038b6ec0e 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1511,15 +1511,6 @@ cifs_find_tcp_session(struct sockaddr *addr, struct smb_vol *vol)
1511 1511
1512 write_lock(&cifs_tcp_ses_lock); 1512 write_lock(&cifs_tcp_ses_lock);
1513 list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) { 1513 list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
1514 /*
1515 * the demux thread can exit on its own while still in CifsNew
1516 * so don't accept any sockets in that state. Since the
1517 * tcpStatus never changes back to CifsNew it's safe to check
1518 * for this without a lock.
1519 */
1520 if (server->tcpStatus == CifsNew)
1521 continue;
1522
1523 if (!match_address(server, addr, 1514 if (!match_address(server, addr,
1524 (struct sockaddr *)&vol->srcaddr)) 1515 (struct sockaddr *)&vol->srcaddr))
1525 continue; 1516 continue;