summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-07-16 21:33:15 +0000
committerSteve French <sfrench@us.ibm.com>2006-08-11 21:28:02 +0000
commit5da07b0208066fd3544ecf2b521fc7a2e0228ad5 (patch)
tree915422bc93ad4fde6cbacbf980b5cd4adc32b7a7 /fs/cifs
parent14a441a2b4ee1dfc00ec822d91d9fb20f401c62f (diff)
downloadlinux-stable-5da07b0208066fd3544ecf2b521fc7a2e0228ad5.tar.gz
linux-stable-5da07b0208066fd3544ecf2b521fc7a2e0228ad5.tar.bz2
linux-stable-5da07b0208066fd3544ecf2b521fc7a2e0228ad5.zip
[CIFS] Make midState usage more consistent
Although harmless, we were sometimes treating midState like it contained flags but they are exclusive states, and this makes that more clear. Signed-off-by: Jeremy Allison <jra@samba.org> Signed-off-by: Steve French <sfrench@us.ibm.com> (cherry picked from 586c057c3a68dd6ae0f3ba94fbf76798b1558074 commit)
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/transport.c12
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,
for (;;) {
curr_timeout = timeout + jiffies;
wait_event(ses->server->response_q,
- (!(midQ->midState & MID_REQUEST_SUBMITTED)) ||
+ (!(midQ->midState == MID_REQUEST_SUBMITTED)) ||
time_after(jiffies, curr_timeout) ||
((ses->server->tcpStatus != CifsGood) &&
(ses->server->tcpStatus != CifsNew)));
if (time_after(jiffies, curr_timeout) &&
- (midQ->midState & MID_REQUEST_SUBMITTED) &&
+ (midQ->midState == MID_REQUEST_SUBMITTED) &&
((ses->server->tcpStatus == CifsGood) ||
(ses->server->tcpStatus == CifsNew))) {
@@ -485,7 +485,7 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses,
}
} else {
wait_event(ses->server->response_q,
- (!(midQ->midState & MID_REQUEST_SUBMITTED)) ||
+ (!(midQ->midState == MID_REQUEST_SUBMITTED)) ||
((ses->server->tcpStatus != CifsGood) &&
(ses->server->tcpStatus != CifsNew)));
}
@@ -749,13 +749,13 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
for (;;) {
curr_timeout = timeout + jiffies;
wait_event(ses->server->response_q,
- (!(midQ->midState & MID_REQUEST_SUBMITTED)) ||
+ (!(midQ->midState == MID_REQUEST_SUBMITTED)) ||
time_after(jiffies, curr_timeout) ||
((ses->server->tcpStatus != CifsGood) &&
(ses->server->tcpStatus != CifsNew)));
if (time_after(jiffies, curr_timeout) &&
- (midQ->midState & MID_REQUEST_SUBMITTED) &&
+ (midQ->midState == MID_REQUEST_SUBMITTED) &&
((ses->server->tcpStatus == CifsGood) ||
(ses->server->tcpStatus == CifsNew))) {
@@ -780,7 +780,7 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
}
} else {
wait_event(ses->server->response_q,
- (!(midQ->midState & MID_REQUEST_SUBMITTED)) ||
+ (!(midQ->midState == MID_REQUEST_SUBMITTED)) ||
((ses->server->tcpStatus != CifsGood) &&
(ses->server->tcpStatus != CifsNew)));
}