svn commit: linux-cifs-client r62 - in
branches/linux-2.6-cifs-git-devel/fs/cifs: .
sfrench at samba.org
sfrench at samba.org
Mon Jul 17 01:28:10 GMT 2006
Author: sfrench
Date: 2006-07-17 01:28:09 +0000 (Mon, 17 Jul 2006)
New Revision: 62
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=62
Log:
make use of midState consistent as jra suggested
Modified:
branches/linux-2.6-cifs-git-devel/fs/cifs/transport.c
Changeset:
Modified: branches/linux-2.6-cifs-git-devel/fs/cifs/transport.c
===================================================================
--- branches/linux-2.6-cifs-git-devel/fs/cifs/transport.c 2006-07-16 05:07:17 UTC (rev 61)
+++ branches/linux-2.6-cifs-git-devel/fs/cifs/transport.c 2006-07-17 01:28:09 UTC (rev 62)
@@ -448,13 +448,13 @@
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 @@
}
} 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 @@
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 @@
}
} 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)));
}
More information about the samba-cvs
mailing list