CIFS: Do not reset lease state to NONE on lease break

BugLink: https://bugs.launchpad.net/bugs/1837952
commit 7b9b9edb49ad377b1e06abf14354c227e9ac4b06 upstream.

Currently on lease break the client sets a caching level twice:
when oplock is detected and when oplock is processed. While the
1st attempt sets the level to the value provided by the server,
the 2nd one resets the level to None unconditionally.
This happens because the oplock/lease processing code was changed
to avoid races between page cache flushes and oplock breaks.
The commit c11f1df5003d534 ("cifs: Wait for writebacks to complete
before attempting write.") fixed the races for oplocks but didn't
apply the same changes for leases resulting in overwriting the
server granted value to None. Fix this by properly processing
lease breaks.

Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c
index bba371071ac6c6cdc7292ec6bdd8931919817167..31f01f09d25a0d67802921d454ff1f8821c632ca 100644 (file)
--- a/fs/cifs/smb2misc.c
+++ b/fs/cifs/smb2misc.c
@@ -479,7 +479,6 @@ smb2_tcon_has_lease(struct cifs_tcon *tcon, struct smb2_lease_break *rsp,
        __u8 lease_state;
        struct list_head *tmp;
        struct cifsFileInfo *cfile;
-       struct TCP_Server_Info *server = tcon->ses->server;
        struct cifs_pending_open *open;
        struct cifsInodeInfo *cinode;
        int ack_req = le32_to_cpu(rsp->Flags &
@@ -499,13 +498,25 @@ smb2_tcon_has_lease(struct cifs_tcon *tcon, struct smb2_lease_break *rsp,
                cifs_dbg(FYI, "lease key match, lease break 0x%x\n",
                         le32_to_cpu(rsp->NewLeaseState));
 
-               server->ops->set_oplock_level(cinode, lease_state, 0, NULL);
-
                if (ack_req)
                        cfile->oplock_break_cancelled = false;
                else
                        cfile->oplock_break_cancelled = true;
 
+               set_bit(CIFS_INODE_PENDING_OPLOCK_BREAK, &cinode->flags);
+
+               /*
+                * Set or clear flags depending on the lease state being READ.
+                * HANDLE caching flag should be added when the client starts
+                * to defer closing remote file handles with HANDLE leases.
+                */
+               if (lease_state & SMB2_LEASE_READ_CACHING_HE)
+                       set_bit(CIFS_INODE_DOWNGRADE_OPLOCK_TO_L2,
+                               &cinode->flags);
+               else
+                       clear_bit(CIFS_INODE_DOWNGRADE_OPLOCK_TO_L2,
+                                 &cinode->flags);
+
                cifs_queue_oplock_break(cfile);
                kfree(lw);
                return true;

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index c3de3d795cb836421e6dc5b7c2a1dd02bc9d5458..fc72256f08405fc0def3d34bbb7e117580820f0e 100644 (file)
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -1924,6 +1924,15 @@ smb2_downgrade_oplock(struct TCP_Server_Info *server,
                server->ops->set_oplock_level(cinode, 0, 0, NULL);
 }
 
+static void
+smb21_downgrade_oplock(struct TCP_Server_Info *server,
+                      struct cifsInodeInfo *cinode, bool set_level2)
+{
+       server->ops->set_oplock_level(cinode,
+                                     set_level2 ? SMB2_LEASE_READ_CACHING_HE :
+                                     0, 0, NULL);
+}
+
 static void
 smb2_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock,
                      unsigned int epoch, bool *purge_cache)
@@ -2889,7 +2898,7 @@ struct smb_version_operations smb21_operations = {
        .print_stats = smb2_print_stats,
        .is_oplock_break = smb2_is_valid_oplock_break,
        .handle_cancelled_mid = smb2_handle_cancelled_mid,
-       .downgrade_oplock = smb2_downgrade_oplock,
+       .downgrade_oplock = smb21_downgrade_oplock,
        .need_neg = smb2_need_neg,
        .negotiate = smb2_negotiate,
        .negotiate_wsize = smb2_negotiate_wsize,
@@ -2984,7 +2993,7 @@ struct smb_version_operations smb30_operations = {
        .dump_share_caps = smb2_dump_share_caps,
        .is_oplock_break = smb2_is_valid_oplock_break,
        .handle_cancelled_mid = smb2_handle_cancelled_mid,
-       .downgrade_oplock = smb2_downgrade_oplock,
+       .downgrade_oplock = smb21_downgrade_oplock,
        .need_neg = smb2_need_neg,
        .negotiate = smb2_negotiate,
        .negotiate_wsize = smb2_negotiate_wsize,
@@ -3089,7 +3098,7 @@ struct smb_version_operations smb311_operations = {
        .dump_share_caps = smb2_dump_share_caps,
        .is_oplock_break = smb2_is_valid_oplock_break,
        .handle_cancelled_mid = smb2_handle_cancelled_mid,
-       .downgrade_oplock = smb2_downgrade_oplock,
+       .downgrade_oplock = smb21_downgrade_oplock,
        .need_neg = smb2_need_neg,
        .negotiate = smb2_negotiate,
        .negotiate_wsize = smb2_negotiate_wsize,