From 0e0c41536387b234fa62cd41ab82ee989e7a3d2a Mon Sep 17 00:00:00 2001
From: Steve French <smfrench@gmail.com>
Date: Wed, 19 Sep 2012 09:19:39 -0700
Subject: [PATCH] --- yaml --- r: 326319 b: refs/heads/master c:
 12e8a20824677fbc24e921d7aebfda6a47cc25b1 h: refs/heads/master i:   326317:
 50d35ebca60beb8c5fcc8d13d9e424a4c36720af   326315:
 fcf7dbf7968d92499e3a26146b01c92775d53f77   326311:
 015e6c14f5d2fbb0ddfbf62868c72c12a6a8898d   326303:
 a93d24d8605b2b7752ce0bcd8aea327684ba8251 v: v3

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

diff --git a/[refs] b/[refs]
index f1a4a9f5d56f..f0cc708759bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba02e89915afcfc9a071a86e5cae32f77c7d353a
+refs/heads/master: 12e8a20824677fbc24e921d7aebfda6a47cc25b1
diff --git a/trunk/fs/cifs/smb2misc.c b/trunk/fs/cifs/smb2misc.c
index cd31715f03f4..7b1c5e3287fb 100644
--- a/trunk/fs/cifs/smb2misc.c
+++ b/trunk/fs/cifs/smb2misc.c
@@ -422,7 +422,8 @@ smb2_is_valid_lease_break(char *buffer, struct TCP_Server_Info *server)
 	struct cifs_pending_open *open;
 	struct smb2_lease_break_work *lw;
 	bool found;
-	int ack_req = rsp->Flags & SMB2_NOTIFY_BREAK_LEASE_FLAG_ACK_REQUIRED;
+	int ack_req = le32_to_cpu(rsp->Flags &
+				  SMB2_NOTIFY_BREAK_LEASE_FLAG_ACK_REQUIRED);
 
 	lw = kmalloc(sizeof(struct smb2_lease_break_work), GFP_KERNEL);
 	if (!lw) {
@@ -524,7 +525,7 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)
 	if (rsp->hdr.Command != SMB2_OPLOCK_BREAK)
 		return false;
 
-	if (le16_to_cpu(rsp->StructureSize) !=
+	if (rsp->StructureSize !=
 				smb2_rsp_struct_sizes[SMB2_OPLOCK_BREAK_HE]) {
 		if (le16_to_cpu(rsp->StructureSize) == 44)
 			return smb2_is_valid_lease_break(buffer, server);
diff --git a/trunk/fs/cifs/smb2ops.c b/trunk/fs/cifs/smb2ops.c
index 630156f98cc7..2183bb343edd 100644
--- a/trunk/fs/cifs/smb2ops.c
+++ b/trunk/fs/cifs/smb2ops.c
@@ -496,7 +496,7 @@ smb2_is_status_pending(char *buf, struct TCP_Server_Info *server, int length)
 {
 	struct smb2_hdr *hdr = (struct smb2_hdr *)buf;
 
-	if (le32_to_cpu(hdr->Status) != STATUS_PENDING)
+	if (hdr->Status != STATUS_PENDING)
 		return false;
 
 	if (!length) {