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

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

Location:

branches/samba-3.5.x/source3/smbd

Files:

• blocking.c (modified) (3 diffs)
• open.c (modified) (2 diffs)

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

@@ -300 +300 @@
 *****************************************************************************/
 
-static void reply_lockingX_error(struct blocking_lock_record *blr, NTSTATUS status)
+static void undo_locks_obtained(struct blocking_lock_record *blr)
 {
         files_struct *fsp = blr->fsp;
@@ -344 +344 @@
                         WINDOWS_LOCK);
         }
-
-        generic_blocking_lock_error(blr, status);
 }
 
@@ -358 +356 @@
         switch(blr->req->cmd) {
         case SMBlockingX:
-                reply_lockingX_error(blr, status);
-                break;
+                /*
+                 * This code can be called during the rundown of a
+                 * file after it was already closed. In that case,
+                 * blr->fsp==NULL and we do not need to undo any
+                 * locks, they are already gone.
+                 */
+                if (blr->fsp != NULL) {
+                        undo_locks_obtained(blr);
+                }
+                generic_blocking_lock_error(blr, status);
+                break;
         case SMBtrans2:
         case SMBtranss2:

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;
         }