Changeset 232 for branches/samba-3.2.x/source/locking/locking.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/locking/locking.c (modified) (4 diffs)

branches/samba-3.2.x/source/locking/locking.c

@@ -1068 +1068 @@
 
 void set_share_mode(struct share_mode_lock *lck, files_struct *fsp,
-                        uid_t uid, uint16 mid, uint16 op_type, bool initial_delete_on_close_allowed)
+                    uid_t uid, uint16 mid, uint16 op_type)
 {
         struct share_mode_entry entry;
         fill_share_mode_entry(&entry, fsp, uid, mid, op_type);
-        if (initial_delete_on_close_allowed) {
-                entry.flags |= SHARE_MODE_ALLOW_INITIAL_DELETE_ON_CLOSE;
-        }
         add_share_mode_entry(lck, &entry);
 }
@@ -1190 +1187 @@
 
         e->op_mid = 0;
-        e->op_type = NO_OPLOCK;
+        if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
+                /*
+                 * Going from exclusive or batch,
+                 * we always go through FAKE_LEVEL_II
+                 * first.
+                 */
+                e->op_type = FAKE_LEVEL_II_OPLOCK;
+        } else {
+                e->op_type = NO_OPLOCK;
+        }
         lck->modified = True;
         return True;
@@ -1270 +1276 @@
 
         return NT_STATUS_OK;
-}
-
-/****************************************************************************
- Do we have an open file handle that created this entry ?
-****************************************************************************/
-
-bool can_set_initial_delete_on_close(const struct share_mode_lock *lck)
-{
-        int i;
-
-        for (i=0; i<lck->num_share_modes; i++) {
-                if (lck->share_modes[i].flags & SHARE_MODE_ALLOW_INITIAL_DELETE_ON_CLOSE) {
-                        return True;
-                }
-        }
-        return False;
 }
 
@@ -1385 +1375 @@
 }
 
-/****************************************************************************
- Sets the allow initial delete on close flag for this share mode.
-****************************************************************************/
-
-bool set_allow_initial_delete_on_close(struct share_mode_lock *lck, files_struct *fsp, bool delete_on_close)
-{
-        struct share_mode_entry entry, *e;
-
-        /* Don't care about the pid owner being correct here - just a search. */
-        fill_share_mode_entry(&entry, fsp, (uid_t)-1, 0, NO_OPLOCK);
-
-        e = find_share_mode_entry(lck, &entry);
-        if (e == NULL) {
-                return False;
-        }
-
-        if (delete_on_close) {
-                e->flags |= SHARE_MODE_ALLOW_INITIAL_DELETE_ON_CLOSE;
-        } else {
-                e->flags &= ~SHARE_MODE_ALLOW_INITIAL_DELETE_ON_CLOSE;
-        }
-        lck->modified = True;
-        return True;
-}
-
 bool set_sticky_write_time(struct file_id fileid, struct timespec write_time)
 {