diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/transport.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index d16e6032d4cf..748b0df07a73 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c | |||
| @@ -448,13 +448,13 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 448 | for (;;) { | 448 | for (;;) { |
| 449 | curr_timeout = timeout + jiffies; | 449 | curr_timeout = timeout + jiffies; |
| 450 | wait_event(ses->server->response_q, | 450 | wait_event(ses->server->response_q, |
| 451 | (!(midQ->midState & MID_REQUEST_SUBMITTED)) || | 451 | (!(midQ->midState == MID_REQUEST_SUBMITTED)) || |
| 452 | time_after(jiffies, curr_timeout) || | 452 | time_after(jiffies, curr_timeout) || |
| 453 | ((ses->server->tcpStatus != CifsGood) && | 453 | ((ses->server->tcpStatus != CifsGood) && |
| 454 | (ses->server->tcpStatus != CifsNew))); | 454 | (ses->server->tcpStatus != CifsNew))); |
| 455 | 455 | ||
| 456 | if (time_after(jiffies, curr_timeout) && | 456 | if (time_after(jiffies, curr_timeout) && |
| 457 | (midQ->midState & MID_REQUEST_SUBMITTED) && | 457 | (midQ->midState == MID_REQUEST_SUBMITTED) && |
| 458 | ((ses->server->tcpStatus == CifsGood) || | 458 | ((ses->server->tcpStatus == CifsGood) || |
| 459 | (ses->server->tcpStatus == CifsNew))) { | 459 | (ses->server->tcpStatus == CifsNew))) { |
| 460 | 460 | ||
| @@ -485,7 +485,7 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 485 | } | 485 | } |
| 486 | } else { | 486 | } else { |
| 487 | wait_event(ses->server->response_q, | 487 | wait_event(ses->server->response_q, |
| 488 | (!(midQ->midState & MID_REQUEST_SUBMITTED)) || | 488 | (!(midQ->midState == MID_REQUEST_SUBMITTED)) || |
| 489 | ((ses->server->tcpStatus != CifsGood) && | 489 | ((ses->server->tcpStatus != CifsGood) && |
| 490 | (ses->server->tcpStatus != CifsNew))); | 490 | (ses->server->tcpStatus != CifsNew))); |
| 491 | } | 491 | } |
| @@ -749,13 +749,13 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 749 | for (;;) { | 749 | for (;;) { |
| 750 | curr_timeout = timeout + jiffies; | 750 | curr_timeout = timeout + jiffies; |
| 751 | wait_event(ses->server->response_q, | 751 | wait_event(ses->server->response_q, |
| 752 | (!(midQ->midState & MID_REQUEST_SUBMITTED)) || | 752 | (!(midQ->midState == MID_REQUEST_SUBMITTED)) || |
| 753 | time_after(jiffies, curr_timeout) || | 753 | time_after(jiffies, curr_timeout) || |
| 754 | ((ses->server->tcpStatus != CifsGood) && | 754 | ((ses->server->tcpStatus != CifsGood) && |
| 755 | (ses->server->tcpStatus != CifsNew))); | 755 | (ses->server->tcpStatus != CifsNew))); |
| 756 | 756 | ||
| 757 | if (time_after(jiffies, curr_timeout) && | 757 | if (time_after(jiffies, curr_timeout) && |
| 758 | (midQ->midState & MID_REQUEST_SUBMITTED) && | 758 | (midQ->midState == MID_REQUEST_SUBMITTED) && |
| 759 | ((ses->server->tcpStatus == CifsGood) || | 759 | ((ses->server->tcpStatus == CifsGood) || |
| 760 | (ses->server->tcpStatus == CifsNew))) { | 760 | (ses->server->tcpStatus == CifsNew))) { |
| 761 | 761 | ||
| @@ -780,7 +780,7 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, | |||
| 780 | } | 780 | } |
| 781 | } else { | 781 | } else { |
| 782 | wait_event(ses->server->response_q, | 782 | wait_event(ses->server->response_q, |
| 783 | (!(midQ->midState & MID_REQUEST_SUBMITTED)) || | 783 | (!(midQ->midState == MID_REQUEST_SUBMITTED)) || |
| 784 | ((ses->server->tcpStatus != CifsGood) && | 784 | ((ses->server->tcpStatus != CifsGood) && |
| 785 | (ses->server->tcpStatus != CifsNew))); | 785 | (ses->server->tcpStatus != CifsNew))); |
| 786 | } | 786 | } |