The unified diff between revisions [2b118beb..] and [4f683bce..] is displayed below. It can also be downloaded as a raw diff.

#
#
# patch "src/fs/aufs/aiops.c"
#  from [9e119ff3301186a77a6049cf19b78f77feace920]
#    to [f4333dc404ce40eb59edcca5eea7fe1a51ab2a5b]
#
# patch "src/fs/coss/store_io_coss.c"
#  from [2ee36fb29e1bc09ccca3adf2542bbbd208ca1213]
#    to [6c6acd007a53f403d82cbe9e5a92dc4e64c0f97c]
#
============================================================
--- src/fs/aufs/aiops.c	9e119ff3301186a77a6049cf19b78f77feace920
+++ src/fs/aufs/aiops.c	f4333dc404ce40eb59edcca5eea7fe1a51ab2a5b
@@ -149,17 +149,17 @@ static int squidaio_initialised = 0;
 static squidaio_thread_t *threads = NULL;
 static int squidaio_initialised = 0;

-#define AIO_LARGE_BUFS  16384
-#define AIO_MEDIUM_BUFS	AIO_LARGE_BUFS >> 1
-#define AIO_SMALL_BUFS	AIO_LARGE_BUFS >> 2
-#define AIO_TINY_BUFS	AIO_LARGE_BUFS >> 3
+#define AIO_LARGE_BUFS  65536
+#define AIO_MEDIUM_BUFS	8192
+#define AIO_SMALL_BUFS	4096
+#define AIO_TINY_BUFS	2048
 #define AIO_MICRO_BUFS	128

 static MemPool *squidaio_large_bufs = NULL;	/* 16K */
 static MemPool *squidaio_medium_bufs = NULL;	/* 8K */
 static MemPool *squidaio_small_bufs = NULL;	/* 4K */
 static MemPool *squidaio_tiny_bufs = NULL;	/* 2K */
-static MemPool *squidaio_micro_bufs = NULL;	/* 128K */
+static MemPool *squidaio_micro_bufs = NULL;	/* 128 */

 static int request_queue_len = 0;
 static MemPool *squidaio_request_pool = NULL;
============================================================
--- src/fs/coss/store_io_coss.c	2ee36fb29e1bc09ccca3adf2542bbbd208ca1213
+++ src/fs/coss/store_io_coss.c	6c6acd007a53f403d82cbe9e5a92dc4e64c0f97c
@@ -537,9 +537,11 @@ storeCossWriteMemBuf(SwapDir * SD, CossM
      * and "writing". Read the rest of the code for more details.
      */
 #if USE_AUFSOPS
-    assert(t->diskend - t->diskstart == COSS_MEMBUF_SZ);
+    /* XXX The last stripe, for now, ain't the coss stripe size for some reason */
+    /* XXX This may cause problems later on; worry about figuring it out later on */
+    //assert(t->diskend - t->diskstart == COSS_MEMBUF_SZ);
     debug(79, 3) ("aioWrite: FD %d: disk start: %llu, size %llu\n", cs->fd, t->diskstart, t->diskend - t->diskstart);
-    aioWrite(cs->fd, t->diskstart, &(t->buffer[0]), COSS_MEMBUF_SZ, storeCossWriteMemBufDone, t, NULL);
+    aioWrite(cs->fd, t->diskstart, &(t->buffer[0]), t->diskend - t->diskstart, storeCossWriteMemBufDone, t, NULL);
 #else
     a_file_write(&cs->aq, cs->fd, t->diskstart, &t->buffer,
 	t->diskend - t->diskstart, storeCossWriteMemBufDone, t, NULL);