From 089ae7687bad1e06462866b8f889610315265e40 Mon Sep 17 00:00:00 2001
From: Pavel Shilovsky <piastry@etersoft.ru>
Date: Wed, 19 Sep 2012 06:22:43 -0700
Subject: [PATCH] --- yaml --- r: 326305 b: refs/heads/master c:
 027e8eec31d8141a6231f772e10ccae60c9d5c13 h: refs/heads/master i:   326303:
 a93d24d8605b2b7752ce0bcd8aea327684ba8251 v: v3

---
 [refs]                  |  2 +-
 trunk/fs/cifs/smb2ops.c | 12 ++++++++++++
 trunk/fs/cifs/smb2pdu.h |  5 +++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ce1b110174cd..190609912991 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d39a4f710b7a7be05b6ed9d4ab8fac754c139f8a
+refs/heads/master: 027e8eec31d8141a6231f772e10ccae60c9d5c13
diff --git a/trunk/fs/cifs/smb2ops.c b/trunk/fs/cifs/smb2ops.c
index b1dedf8cb372..e4a59d1f06b1 100644
--- a/trunk/fs/cifs/smb2ops.c
+++ b/trunk/fs/cifs/smb2ops.c
@@ -537,7 +537,15 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
 	return rc;
 }
 
+static bool
+smb2_compare_fids(struct cifsFileInfo *ob1, struct cifsFileInfo *ob2)
+{
+	return ob1->fid.persistent_fid == ob2->fid.persistent_fid &&
+	       ob1->fid.volatile_fid == ob2->fid.volatile_fid;
+}
+
 struct smb_version_operations smb21_operations = {
+	.compare_fids = smb2_compare_fids,
 	.setup_request = smb2_setup_request,
 	.setup_async_request = smb2_setup_async_request,
 	.check_receive = smb2_check_receive,
@@ -598,6 +606,10 @@ struct smb_version_operations smb21_operations = {
 
 struct smb_version_values smb21_values = {
 	.version_string = SMB21_VERSION_STRING,
+	.large_lock_type = 0,
+	.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
+	.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
+	.unlock_lock_type = SMB2_LOCKFLAG_UNLOCK,
 	.header_size = sizeof(struct smb2_hdr),
 	.max_header_size = MAX_SMB2_HDR_SIZE,
 	.read_rsp_size = sizeof(struct smb2_read_rsp) - 1,
diff --git a/trunk/fs/cifs/smb2pdu.h b/trunk/fs/cifs/smb2pdu.h
index 3c8e99ea88ad..d2d132e94155 100644
--- a/trunk/fs/cifs/smb2pdu.h
+++ b/trunk/fs/cifs/smb2pdu.h
@@ -526,6 +526,11 @@ struct smb2_write_rsp {
 	__u8   Buffer[1];
 } __packed;
 
+#define SMB2_LOCKFLAG_SHARED_LOCK	0x0001
+#define SMB2_LOCKFLAG_EXCLUSIVE_LOCK	0x0002
+#define SMB2_LOCKFLAG_UNLOCK		0x0004
+#define SMB2_LOCKFLAG_FAIL_IMMEDIATELY	0x0010
+
 struct smb2_echo_req {
 	struct smb2_hdr hdr;
 	__le16 StructureSize;	/* Must be 4 */