Attachment 4891 Details for Bug 6828 – Follow on patch for master, 3.5.0 and v3-4-test.

[patch] Follow on patch for master, 3.5.0 and v3-4-test.

look (text/plain), 1.38 KB, created by Jeremy Allison on 2009-10-26 19:59:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2009-10-26 19:59:03 UTC

Size: 1.38 KB

patch

obsolete

>diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
>index 01d9ca8..deb7f8f 100644
>--- a/source3/smbd/blocking.c
>+++ b/source3/smbd/blocking.c
>@@ -652,7 +652,6 @@ void process_blocking_lock_queue(void)
> {
> 	struct timeval tv_curr = timeval_current();
> 	struct blocking_lock_record *blr, *next = NULL;
>-	bool recalc_timeout = False;
> 
> 	/*
> 	 * Go through the queue and see if we can get any of the locks.
>@@ -670,6 +669,14 @@ void process_blocking_lock_queue(void)
> 
> 		DEBUG(10, ("Processing BLR = %p\n", blr));
> 
>+		/* We use set_current_service so connections with
>+		 * pending locks are not marked as idle.
>+		 */
>+
>+		set_current_service(blr->fsp->conn,
>+				SVAL(blr->req->inbuf,smb_flg),
>+				false);
>+
> 		if(blocking_lock_record_process(blr)) {
> 			struct byte_range_lock *br_lck = brl_get_locks(
> 				talloc_tos(), blr->fsp);
>@@ -690,7 +697,6 @@ void process_blocking_lock_queue(void)
> 
> 			DLIST_REMOVE(blocking_lock_queue, blr);
> 			TALLOC_FREE(blr);
>-			recalc_timeout = True;
> 			continue;
> 		}
> 
>@@ -729,13 +735,10 @@ void process_blocking_lock_queue(void)
> 			blocking_lock_reply_error(blr,NT_STATUS_FILE_LOCK_CONFLICT);
> 			DLIST_REMOVE(blocking_lock_queue, blr);
> 			TALLOC_FREE(blr);
>-			recalc_timeout = True;
> 		}
> 	}
> 
>-	if (recalc_timeout) {
>-		recalc_brl_timeout();
>-	}
>+	recalc_brl_timeout();
> }
> 
> /****************************************************************************

Actions: View

Attachments on bug 6828: 4866 | 4872 | 4873 | 4889 | 4890 | 4891 | 4899 | 4900