1 files changed, 23 insertions, 2 deletions

diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index bee203055b30..1e1626a2cfc3 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -501,8 +501,7 @@ is_valid_oplock_break(char *buffer, struct TCP_Server_Info *srv)
                                            CIFS_INODE_DOWNGRADE_OPLOCK_TO_L2,
                                            &pCifsInode->flags);
 
-                                queue_work(cifsoplockd_wq,
-                                           &netfile->oplock_break);
+                                cifs_queue_oplock_break(netfile);
                                 netfile->oplock_break_cancelled = false;
 
                                 spin_unlock(&tcon->open_file_lock);
@@ -607,6 +606,28 @@ void cifs_put_writer(struct cifsInodeInfo *cinode)
         spin_unlock(&cinode->writers_lock);
 }
 
+/**
+ * cifs_queue_oplock_break - queue the oplock break handler for cfile
+ *
+ * This function is called from the demultiplex thread when it
+ * receives an oplock break for @cfile.
+ *
+ * Assumes the tcon->open_file_lock is held.
+ * Assumes cfile->file_info_lock is NOT held.
+ */
+void cifs_queue_oplock_break(struct cifsFileInfo *cfile)
+{
+        /*
+         * Bump the handle refcount now while we hold the
+         * open_file_lock to enforce the validity of it for the oplock
+         * break handler. The matching put is done at the end of the
+         * handler.
+         */
+        cifsFileInfo_get(cfile);
+
+        queue_work(cifsoplockd_wq, &cfile->oplock_break);
+}
+
 void cifs_done_oplock_break(struct cifsInodeInfo *cinode)
 {
         clear_bit(CIFS_INODE_PENDING_OPLOCK_BREAK, &cinode->flags);