svn commit: samba r8402 - branches/SAMBA_3_0/source/smbd trunk/source/smbd

[gd at samba.org]

Author: gd
Date: 2005-07-13 00:26:52 +0000 (Wed, 13 Jul 2005)
New Revision: 8402

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8402

Log:
allow to build with --enable-aio-support.

Guenther

Modified:
   branches/SAMBA_3_0/source/smbd/aio.c
   trunk/source/smbd/aio.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/aio.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/aio.c	2005-07-13 00:17:02 UTC (rev 8401)
+++ branches/SAMBA_3_0/source/smbd/aio.c	2005-07-13 00:26:52 UTC (rev 8402)
@@ -242,7 +242,7 @@
 
 	/* Now set up the aio record for the read call. */
 	
-	a->aio_fildes = fsp->fd;
+	a->aio_fildes = fsp->fh->fd;
 	a->aio_buf = smb_buf(aio_ex->outbuf);
 	a->aio_nbytes = smb_maxcnt;
 	a->aio_offset = startpos;
@@ -321,7 +321,7 @@
 
 	/* Now set up the aio record for the write call. */
 	
-	a->aio_fildes = fsp->fd;
+	a->aio_fildes = fsp->fh->fd;
 	a->aio_buf = data; /* As we've stolen inbuf this points within inbuf. */
 	a->aio_nbytes = numtowrite;
 	a->aio_offset = startpos;
@@ -677,7 +677,7 @@
 		if (aio_ex->fsp == fsp) {
 			/* Don't delete the aio_extra record as we may have completed
 			   and don't yet know it. Just do the aio_cancel call and return. */
-			SMB_VFS_AIO_CANCEL(fsp,fsp->fd, &aio_ex->acb);
+			SMB_VFS_AIO_CANCEL(fsp,fsp->fh->fd, &aio_ex->acb);
 			aio_ex->fsp = NULL; /* fsp will be closed when we return. */
 		}
 	}

Modified: trunk/source/smbd/aio.c
===================================================================
--- trunk/source/smbd/aio.c	2005-07-13 00:17:02 UTC (rev 8401)
+++ trunk/source/smbd/aio.c	2005-07-13 00:26:52 UTC (rev 8402)
@@ -242,7 +242,7 @@
 
 	/* Now set up the aio record for the read call. */
 	
-	a->aio_fildes = fsp->fd;
+	a->aio_fildes = fsp->fh->fd;
 	a->aio_buf = smb_buf(aio_ex->outbuf);
 	a->aio_nbytes = smb_maxcnt;
 	a->aio_offset = startpos;
@@ -321,7 +321,7 @@
 
 	/* Now set up the aio record for the write call. */
 	
-	a->aio_fildes = fsp->fd;
+	a->aio_fildes = fsp->fh->fd;
 	a->aio_buf = data; /* As we've stolen inbuf this points within inbuf. */
 	a->aio_nbytes = numtowrite;
 	a->aio_offset = startpos;
@@ -677,7 +677,7 @@
 		if (aio_ex->fsp == fsp) {
 			/* Don't delete the aio_extra record as we may have completed
 			   and don't yet know it. Just do the aio_cancel call and return. */
-			SMB_VFS_AIO_CANCEL(fsp,fsp->fd, &aio_ex->acb);
+			SMB_VFS_AIO_CANCEL(fsp,fsp->fh->fd, &aio_ex->acb);
 			aio_ex->fsp = NULL; /* fsp will be closed when we return. */
 		}
 	}