[SCM] Samba Shared Repository - branch v3-5-test updated - tevent-0-9-8-901-g5b0b939

[Jeremy Allison]

The branch, v3-5-test has been updated
       via  5b0b93991f256d1cd5c681c60075c4b17a0bc3c9 (commit)
      from  69d345ca71d127467fda768dc364a85333811397 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 5b0b93991f256d1cd5c681c60075c4b17a0bc3c9
Author: Olaf Flebbe <o.flebbe at science-computing.de>
Date:   Wed Sep 30 15:20:09 2009 -0700

    allow for outstanding_aio_calls to be decremented

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/aio.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

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) {


-- 
Samba Shared Repository