CIFS: Store lease state itself rather than a mapped oplock value

and separate smb20_operations struct.

Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index 6fd0677915a0..8233b174de3d 100644
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -912,6 +912,12 @@ cifs_query_symlink(const unsigned int xid, struct cifs_tcon *tcon,
         return rc;
 }
 
+static bool
+cifs_is_read_op(__u32 oplock)
+{
+        return oplock == OPLOCK_READ;
+}
+
 struct smb_version_operations smb1_operations = {
         .send_cancel = send_nt_cancel,
         .compare_fids = cifs_compare_fids,
@@ -977,6 +983,7 @@ struct smb_version_operations smb1_operations = {
         .mand_unlock_range = cifs_unlock_range,
         .push_mand_locks = cifs_push_mandatory_locks,
         .query_mf_symlink = open_query_close_cifs_symlink,
+        .is_read_op = cifs_is_read_op,
 };
 
 struct smb_version_values smb1_values = {
@@ -992,7 +999,6 @@ struct smb_version_values smb1_values = {
         .cap_unix = CAP_UNIX,
         .cap_nt_find = CAP_NT_SMBS | CAP_NT_FIND,
         .cap_large_files = CAP_LARGE_FILES,
-        .oplock_read = OPLOCK_READ,
         .signing_enabled = SECMODE_SIGN_ENABLED,
         .signing_required = SECMODE_SIGN_REQUIRED,
 };