svn commit: linux-cifs-client r59 - in branches/linux-converged-for-old-kernels/fs/cifs: .

[jra]

Author: jra
Date: 2006-07-16 01:49:10 +0000 (Sun, 16 Jul 2006)
New Revision: 59

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=linux-cifs-client&rev=59

Log:
Don't use "midQ->midState & MID_REQUEST_SUBMITTED"
as this isn't a flag bit - use midQ->midState == MID_REQUEST_SUBMITTED
instead. I know currently this doesn't make a difference
but it makes the use of midState clearer.
Jeremy.

Modified:
   branches/linux-converged-for-old-kernels/fs/cifs/transport.c


Changeset:
Modified: branches/linux-converged-for-old-kernels/fs/cifs/transport.c
===================================================================
--- branches/linux-converged-for-old-kernels/fs/cifs/transport.c        
2006-07-15 22:05:22 UTC (rev 58)
+++ branches/linux-converged-for-old-kernels/fs/cifs/transport.c        
2006-07-16 01:49:10 UTC (rev 59)
@@ -482,13 +482,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))) {
 
@@ -513,7 +513,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)));
        }
@@ -777,13 +777,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))) {
 
@@ -808,7 +808,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)));
        }