Changeset 738 for branches/samba-3.5.x/source3/smbd/open.c

Timestamp:

Nov 12, 2012, 7:10:02 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.18

File:

• branches/samba-3.5.x/source3/smbd/open.c (modified) (2 diffs)

branches/samba-3.5.x/source3/smbd/open.c

@@ -895 +895 @@
 }
 
-static bool is_delete_request(files_struct *fsp) {
-        return ((fsp->access_mask == DELETE_ACCESS) &&
-                (fsp->oplock_type == NO_OPLOCK));
-}
-
 /*
  * Send a break message to the oplock holder and delay the open for
@@ -1003 +998 @@
 
         if (exclusive != NULL) { /* Found an exclusive oplock */
-                bool delay_it = is_delete_request(fsp) ?
-                                BATCH_OPLOCK_TYPE(exclusive->op_type) : true;
                 SMB_ASSERT(!have_level2);
-                if (delay_it) {
-                        send_break_message(fsp, exclusive, mid, oplock_request);
-                        return true;
-                }
+                send_break_message(fsp, exclusive, mid, oplock_request);
+                return true;
         }