--------------------- PatchSet 396 Date: 2000/07/01 14:12:52 Author: hno Branch: hno-devel Tag: (none) Log: Oops.. fixed a small merge error Members: src/fs/aufs/aiops.c:1.1.6.1.2.2->1.1.6.1.2.3 Index: squid/src/fs/aufs/aiops.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/aufs/aiops.c,v retrieving revision 1.1.6.1.2.2 retrieving revision 1.1.6.1.2.3 diff -u -r1.1.6.1.2.2 -r1.1.6.1.2.3 --- squid/src/fs/aufs/aiops.c 1 Jul 2000 12:20:15 -0000 1.1.6.1.2.2 +++ squid/src/fs/aufs/aiops.c 1 Jul 2000 14:12:52 -0000 1.1.6.1.2.3 @@ -736,7 +736,7 @@ requestp->request_type = _AIO_OP_TRUNCATE; requestp->cancelled = 0; - aio_do_request(requestp); + aio_queue_request(requestp); return 0; }