tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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)

Steve French 5da07b02 14a441a2

+6 -6
unified split
+6 -6
fs/cifs/transport.c
··· 448 448 for (;;) { 449 449 curr_timeout = timeout + jiffies; 450 450 wait_event(ses->server->response_q, 451 - (!(midQ->midState & MID_REQUEST_SUBMITTED)) || 451 + (!(midQ->midState == MID_REQUEST_SUBMITTED)) || 452 452 time_after(jiffies, curr_timeout) || 453 453 ((ses->server->tcpStatus != CifsGood) && 454 454 (ses->server->tcpStatus != CifsNew))); 455 455 456 456 if (time_after(jiffies, curr_timeout) && 457 - (midQ->midState & MID_REQUEST_SUBMITTED) && 457 + (midQ->midState == MID_REQUEST_SUBMITTED) && 458 458 ((ses->server->tcpStatus == CifsGood) || 459 459 (ses->server->tcpStatus == CifsNew))) { 460 460 ··· 485 485 } 486 486 } else { 487 487 wait_event(ses->server->response_q, 488 - (!(midQ->midState & MID_REQUEST_SUBMITTED)) || 488 + (!(midQ->midState == MID_REQUEST_SUBMITTED)) || 489 489 ((ses->server->tcpStatus != CifsGood) && 490 490 (ses->server->tcpStatus != CifsNew))); 491 491 } ··· 749 749 for (;;) { 750 750 curr_timeout = timeout + jiffies; 751 751 wait_event(ses->server->response_q, 752 - (!(midQ->midState & MID_REQUEST_SUBMITTED)) || 752 + (!(midQ->midState == MID_REQUEST_SUBMITTED)) || 753 753 time_after(jiffies, curr_timeout) || 754 754 ((ses->server->tcpStatus != CifsGood) && 755 755 (ses->server->tcpStatus != CifsNew))); 756 756 757 757 if (time_after(jiffies, curr_timeout) && 758 - (midQ->midState & MID_REQUEST_SUBMITTED) && 758 + (midQ->midState == MID_REQUEST_SUBMITTED) && 759 759 ((ses->server->tcpStatus == CifsGood) || 760 760 (ses->server->tcpStatus == CifsNew))) { 761 761 ··· 780 780 } 781 781 } else { 782 782 wait_event(ses->server->response_q, 783 - (!(midQ->midState & MID_REQUEST_SUBMITTED)) || 783 + (!(midQ->midState == MID_REQUEST_SUBMITTED)) || 784 784 ((ses->server->tcpStatus != CifsGood) && 785 785 (ses->server->tcpStatus != CifsNew))); 786 786 }