1 files changed, 22 insertions, 12 deletions

diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index e079a9190ec4..0241b25ac33f 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -32,7 +32,6 @@
 
 extern mempool_t *cifs_sm_req_poolp;
 extern mempool_t *cifs_req_poolp;
-extern struct task_struct *oplockThread;
 
 /* The xid serves as a useful identifier for each incoming vfs request,
    in a similar way to the mid which is useful to track each sent smb,
@@ -500,6 +499,7 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)
         struct cifsTconInfo *tcon;
         struct cifsInodeInfo *pCifsInode;
         struct cifsFileInfo *netfile;
+        int rc;
 
         cFYI(1, ("Checking for oplock break or dnotify response"));
         if ((pSMB->hdr.Command == SMB_COM_NT_TRANSACT) &&
@@ -562,30 +562,40 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)
                                 continue;
 
                         cifs_stats_inc(&tcon->num_oplock_brks);
-                        write_lock(&GlobalSMBSeslock);
+                        read_lock(&GlobalSMBSeslock);
                         list_for_each(tmp2, &tcon->openFileList) {
                                 netfile = list_entry(tmp2, struct cifsFileInfo,
                                                      tlist);
                                 if (pSMB->Fid != netfile->netfid)
                                         continue;
 
-                                write_unlock(&GlobalSMBSeslock);
-                                read_unlock(&cifs_tcp_ses_lock);
+                                /*
+                                 * don't do anything if file is about to be
+                                 * closed anyway.
+                                 */
+                                if (netfile->closePend) {
+                                        read_unlock(&GlobalSMBSeslock);
+                                        read_unlock(&cifs_tcp_ses_lock);
+                                        return true;
+                                }
+
                                 cFYI(1, ("file id match, oplock break"));
                                 pCifsInode = CIFS_I(netfile->pInode);
                                 pCifsInode->clientCanCacheAll = false;
                                 if (pSMB->OplockLevel == 0)
                                         pCifsInode->clientCanCacheRead = false;
-                                pCifsInode->oplockPending = true;
-                                AllocOplockQEntry(netfile->pInode,
-                                                  netfile->netfid, tcon);
-                                cFYI(1, ("about to wake up oplock thread"));
-                                if (oplockThread)
-                                        wake_up_process(oplockThread);
-
+                                rc = slow_work_enqueue(&netfile->oplock_break);
+                                if (rc) {
+                                        cERROR(1, ("failed to enqueue oplock "
+                                                   "break: %d\n", rc));
+                                } else {
+                                        netfile->oplock_break_cancelled = false;
+                                }
+                                read_unlock(&GlobalSMBSeslock);
+                                read_unlock(&cifs_tcp_ses_lock);
                                 return true;
                         }
-                        write_unlock(&GlobalSMBSeslock);
+                        read_unlock(&GlobalSMBSeslock);
                         read_unlock(&cifs_tcp_ses_lock);
                         cFYI(1, ("No matching file for oplock break"));
                         return true;