Merge git://git.infradead.org/users/cbou/battery-3.1

[~andy/linux] / fs / cifs / misc.c

diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 03a1f491d39b494632ecf09845c84ac839f6a6eb..7c16933925987d7bcbb213ab5abc30b8e17655eb 100644 (file)
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -585,15 +585,8 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)
 
                                cifs_set_oplock_level(pCifsInode,
                                        pSMB->OplockLevel ? OPLOCK_READ : 0);
-                               /*
-                                * cifs_oplock_break_put() can't be called
-                                * from here.  Get reference after queueing
-                                * succeeded.  cifs_oplock_break() will
-                                * synchronize using cifs_file_list_lock.
-                                */
-                               if (queue_work(system_nrt_wq,
-                                              &netfile->oplock_break))
-                                       cifs_oplock_break_get(netfile);
+                               queue_work(system_nrt_wq,
+                                          &netfile->oplock_break);
                                netfile->oplock_break_cancelled = false;
 
                                spin_unlock(&cifs_file_list_lock);