[PATCH] cifs: Do not interpret oplock break responses as responses to an unrelated command

.. even if the multiplex ids match.

Signed-off-by: Steve French (sfrench@us.ibm.com)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 1f22b85324cf..383e55fa7d26 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -361,9 +361,13 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)
                                                                mid_q_entry,
                                                                qhead);
 
-                                        if ((mid_entry->mid == smb_buffer->Mid) && (mid_entry->midState == MID_REQUEST_SUBMITTED)) {
-                                                cFYI(1,
-                                                     (" Mid 0x%x matched - waking up ",mid_entry->mid));
+                                        if ((mid_entry->mid == smb_buffer->Mid)
+                                                && (mid_entry->midState == 
+                                                        MID_REQUEST_SUBMITTED) 
+                                                && (mid_entry->command == 
+                                                        smb_buffer->Command)) {
+                                                cFYI(1,("Found Mid 0x%x wake up"
+                                                        ,mid_entry->mid));
                                                 task_to_wake = mid_entry->tsk;
                                                 mid_entry->resp_buf =
                                                     smb_buffer;