From 9e93a90f7012f1c3242532706264890edf40d8ba Mon Sep 17 00:00:00 2001
From: Pavel Shilovsky <pshilovsky@samba.org>
Date: Mon, 28 May 2012 15:50:10 +0400
Subject: [PATCH] --- yaml --- r: 310460 b: refs/heads/master c:
 7f0adb53bcf5bdb92236cda8ec92ea5e40993028 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/connect.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3e5fd5b9cf0f..b570f422a109 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea319d57d3372a9dbee0b3807d75bb36b8d54adc
+refs/heads/master: 7f0adb53bcf5bdb92236cda8ec92ea5e40993028
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index ccafdedd0dbc..3647b1a4540b 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -1058,13 +1058,15 @@ cifs_demultiplex_thread(void *p)
 		if (mid_entry != NULL) {
 			if (!mid_entry->multiRsp || mid_entry->multiEnd)
 				mid_entry->callback(mid_entry);
-		} else if (!server->ops->is_oplock_break(buf, server)) {
+		} else if (!server->ops->is_oplock_break ||
+			   !server->ops->is_oplock_break(buf, server)) {
 			cERROR(1, "No task to wake, unknown frame received! "
 				   "NumMids %d", atomic_read(&midCount));
 			cifs_dump_mem("Received Data is: ", buf,
 				      HEADER_SIZE(server));
 #ifdef CONFIG_CIFS_DEBUG2
-			server->ops->dump_detail(buf);
+			if (server->ops->dump_detail)
+				server->ops->dump_detail(buf);
 			cifs_dump_mids(server);
 #endif /* CIFS_DEBUG2 */