Index: src/fs/aufs/store_io_aufs.c
===================================================================
RCS file: /cvsroot/squid/squid/src/fs/aufs/store_io_aufs.c,v
retrieving revision 1.13
diff -u -p -r1.13 store_io_aufs.c
--- src/fs/aufs/store_io_aufs.c	21 Dec 2001 15:14:49 -0000	1.13
+++ src/fs/aufs/store_io_aufs.c	7 Apr 2002 13:43:58 -0000
@@ -49,7 +49,7 @@ storeAufsOpen(SwapDir * SD, StoreEntry *
 #if !ASYNC_OPEN
     fd = file_open(path, O_RDONLY | O_BINARY);
     if (fd < 0) {
-	debug(78, 3) ("storeAufsOpen: got failude (%d)\n", errno);
+	debug(78, 3) ("storeAufsOpen: got failure (%d)\n", errno);
 	return NULL;
     }
 #endif
@@ -103,7 +103,7 @@ storeAufsCreate(SwapDir * SD, StoreEntry
 #if !ASYNC_CREATE
     fd = file_open(path, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY);
     if (fd < 0) {
-	debug(78, 3) ("storeAufsCreate: got failude (%d)\n", errno);
+	debug(78, 3) ("storeAufsCreate: got failure (%d)\n", errno);
 	return NULL;
     }
 #endif
@@ -182,7 +182,7 @@ storeAufsRead(SwapDir * SD, storeIOState
 #if ASYNC_READ
     aioRead(aiostate->fd, offset, buf, size, storeAufsReadDone, sio);
 #else
-    file_read(aiostate->fd, offset, buf, size, storeAufsReadDone, sio);
+    file_read(aiostate->fd, buf, size, offset, storeAufsReadDone, sio);
 #endif
 }
 
@@ -300,7 +300,7 @@ static void
 storeAufsReadDone(int fd, void *my_data, int len, int errflag)
 #else
 static void
-storeAufsReadDone(int fd, int errflag, size_t len, void *my_data)
+storeAufsReadDone(int fd, const char *buf, int len, int errflag, void *my_data)
 #endif
 {
     storeIOState *sio = my_data;
@@ -359,7 +359,7 @@ storeAufsWriteDone(int fd, int errflag, 
     /* Translate from errno to Squid disk error */
     errno = errflag;
     if (errflag)
-	errflag = errno == ENOSP ? DISK_NO_SPACE_LEFT : DISK_ERROR;
+	errflag = errno == ENOSPC ? DISK_NO_SPACE_LEFT : DISK_ERROR;
     else
 	errflag = DISK_OK;
 #endif