Attachment 4769 Details for Bug 6772 – git-am formatted patch that went into master.

[patch] git-am formatted patch that went into master.

0001-allow-for-outstanding_aio_calls-to-be-decremented.patch (text/plain), 1.69 KB, created by Jeremy Allison on 2009-09-30 19:47:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2009-09-30 19:47:36 UTC

Size: 1.69 KB

patch

obsolete

>From 087ba21b41f8a857d239d8842b6bcdf355ad61c8 Mon Sep 17 00:00:00 2001
>From: Olaf Flebbe <o.flebbe@science-computing.de>
>Date: Wed, 30 Sep 2009 15:20:09 -0700
>Subject: [PATCH] allow for outstanding_aio_calls to be decremented
>
>---
> source3/smbd/aio.c |    6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
>index c0367a5..491dd79 100644
>--- a/source3/smbd/aio.c
>+++ b/source3/smbd/aio.c
>@@ -184,6 +184,7 @@ bool schedule_aio_read_and_X(connection_struct *conn,
> 		return False;
> 	}
> 
>+	outstanding_aio_calls++;
> 	aio_ex->req = talloc_move(aio_ex, &req);
> 
> 	DEBUG(10,("schedule_aio_read_and_X: scheduled aio_read for file %s, "
>@@ -191,7 +192,6 @@ bool schedule_aio_read_and_X(connection_struct *conn,
> 		  fsp_str_dbg(fsp), (double)startpos, (unsigned int)smb_maxcnt,
> 		  (unsigned int)aio_ex->req->mid ));
> 
>-	outstanding_aio_calls++;
> 	return True;
> }
> 
>@@ -279,6 +279,7 @@ bool schedule_aio_write_and_X(connection_struct *conn,
> 		return False;
> 	}
> 
>+	outstanding_aio_calls++;
> 	aio_ex->req = talloc_move(aio_ex, &req);
> 
> 	/* This should actually be improved to span the write. */
>@@ -302,7 +303,6 @@ bool schedule_aio_write_and_X(connection_struct *conn,
> 		DEBUG(10,("schedule_aio_write_and_X: scheduled aio_write "
> 			  "behind for file %s\n", fsp_str_dbg(fsp)));
> 	}
>-	outstanding_aio_calls++;
> 
> 	DEBUG(10,("schedule_aio_write_and_X: scheduled aio_write for file "
> 		  "%s, offset %.0f, len = %u (mid = %u) "
>@@ -519,6 +519,8 @@ void smbd_aio_complete_mid(unsigned int mid)
> 	struct aio_extra *aio_ex = find_aio_ex(mid);
> 	int ret = 0;
> 
>+	outstanding_aio_calls--;
>+
> 	DEBUG(10,("smbd_aio_complete_mid: mid[%u]\n", mid));
> 
> 	if (!aio_ex) {
>-- 
>1.6.0.4
>

Flags:

vl: review+

Actions: View

Attachments on bug 6772: 4766 | 4769 | 4783