[smb3] move more common protocol header definitions to smbfs_common

[linux-block.git] / fs / cifs / smb2ops.c

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index bf5d5b5ea829557c9d50099eb76071b5165aee37..fb1d74791f4c3ca6275deab1aedcc316bc6c14da 100644 (file)
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -4319,12 +4319,12 @@ static __le32
 map_oplock_to_lease(u8 oplock)
 {
        if (oplock == SMB2_OPLOCK_LEVEL_EXCLUSIVE)
-               return SMB2_LEASE_WRITE_CACHING | SMB2_LEASE_READ_CACHING;
+               return SMB2_LEASE_WRITE_CACHING_LE | SMB2_LEASE_READ_CACHING_LE;
        else if (oplock == SMB2_OPLOCK_LEVEL_II)
-               return SMB2_LEASE_READ_CACHING;
+               return SMB2_LEASE_READ_CACHING_LE;
        else if (oplock == SMB2_OPLOCK_LEVEL_BATCH)
-               return SMB2_LEASE_HANDLE_CACHING | SMB2_LEASE_READ_CACHING |
-                      SMB2_LEASE_WRITE_CACHING;
+               return SMB2_LEASE_HANDLE_CACHING_LE | SMB2_LEASE_READ_CACHING_LE |
+                      SMB2_LEASE_WRITE_CACHING_LE;
        return 0;
 }
 
@@ -4386,7 +4386,7 @@ smb2_parse_lease_buf(void *buf, unsigned int *epoch, char *lease_key)
        struct create_lease *lc = (struct create_lease *)buf;
 
        *epoch = 0; /* not used */
-       if (lc->lcontext.LeaseFlags & SMB2_LEASE_FLAG_BREAK_IN_PROGRESS)
+       if (lc->lcontext.LeaseFlags & SMB2_LEASE_FLAG_BREAK_IN_PROGRESS_LE)
                return SMB2_OPLOCK_LEVEL_NOCHANGE;
        return le32_to_cpu(lc->lcontext.LeaseState);
 }
@@ -4397,7 +4397,7 @@ smb3_parse_lease_buf(void *buf, unsigned int *epoch, char *lease_key)
        struct create_lease_v2 *lc = (struct create_lease_v2 *)buf;
 
        *epoch = le16_to_cpu(lc->lcontext.Epoch);
-       if (lc->lcontext.LeaseFlags & SMB2_LEASE_FLAG_BREAK_IN_PROGRESS)
+       if (lc->lcontext.LeaseFlags & SMB2_LEASE_FLAG_BREAK_IN_PROGRESS_LE)
                return SMB2_OPLOCK_LEVEL_NOCHANGE;
        if (lease_key)
                memcpy(lease_key, &lc->lcontext.LeaseKey, SMB2_LEASE_KEY_SIZE);