Changeset 989 for vendor/current/source3/smbd/oplock.c

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/source3/smbd/oplock.c (modified) (3 diffs)

vendor/current/source3/smbd/oplock.c

@@ -191 +191 @@
                  * If we're the only one, we don't need a brlock entry
                  */
+                remove_stale_share_mode_entries(d);
                 SMB_ASSERT(d->num_share_modes == 1);
                 SMB_ASSERT(EXCLUSIVE_OPLOCK_TYPE(d->share_modes[0].op_type));
@@ -220 +221 @@
         TALLOC_FREE(br_lck);
         return true;
+}
+
+/****************************************************************************
+ Remove a file oplock with lock already held. Copes with level II and exclusive.
+****************************************************************************/
+
+bool remove_oplock_under_lock(files_struct *fsp, struct share_mode_lock *lck)
+{
+        bool ret;
+
+        ret = remove_share_oplock(lck, fsp);
+        if (!ret) {
+                DBG_ERR("failed to remove share oplock for "
+                        "file %s, %s, %s\n",
+                        fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
+                        file_id_string_tos(&fsp->file_id));
+        }
+        release_file_oplock(fsp);
+
+        ret = update_num_read_oplocks(fsp, lck);
+        if (!ret) {
+                DBG_ERR("update_num_read_oplocks failed for "
+                        "file %s, %s, %s\n",
+                        fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
+                        file_id_string_tos(&fsp->file_id));
+        }
+
+        return ret;
 }
 
@@ -233 +262 @@
         struct share_mode_lock *lck;
 
-        DEBUG(10, ("remove_oplock called for %s\n",
-                   fsp_str_dbg(fsp)));
+        DBG_DEBUG("remove_oplock called for %s\n", fsp_str_dbg(fsp));
 
         /* Remove the oplock flag from the sharemode. */
         lck = get_existing_share_mode_lock(talloc_tos(), fsp->file_id);
         if (lck == NULL) {
-                DEBUG(0,("remove_oplock: failed to lock share entry for "
-                         "file %s\n", fsp_str_dbg(fsp)));
-                return False;
-        }
-
-        ret = remove_share_oplock(lck, fsp);
-        if (!ret) {
-                DEBUG(0,("remove_oplock: failed to remove share oplock for "
-                         "file %s, %s, %s\n",
-                         fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
-                         file_id_string_tos(&fsp->file_id)));
-        }
-        release_file_oplock(fsp);
-
-        ret = update_num_read_oplocks(fsp, lck);
-        if (!ret) {
-                DEBUG(0, ("%s: update_num_read_oplocks failed for "
-                         "file %s, %s, %s\n",
-                          __func__, fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
-                         file_id_string_tos(&fsp->file_id)));
-        }
+                DBG_ERR("failed to lock share entry for "
+                         "file %s\n", fsp_str_dbg(fsp));
+                return false;
+        }
+
+        ret = remove_oplock_under_lock(fsp, lck);
 
         TALLOC_FREE(lck);