--------------------- PatchSet 339 Date: 2002/12/13 01:22:29 Author: rbcollins Branch: unify-io Tag: (none) Log: simplify conditional Members: src/fs/aufs/store_io_aufs.cc:1.3.12.33->1.3.12.34 Index: squid3/src/fs/aufs/store_io_aufs.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/aufs/Attic/store_io_aufs.cc,v retrieving revision 1.3.12.33 retrieving revision 1.3.12.34 diff -u -r1.3.12.33 -r1.3.12.34 --- squid3/src/fs/aufs/store_io_aufs.cc 13 Dec 2002 01:14:46 -0000 1.3.12.33 +++ squid3/src/fs/aufs/store_io_aufs.cc 13 Dec 2002 01:22:29 -0000 1.3.12.34 @@ -265,7 +265,7 @@ void AUFSFile::write(char const *buf, size_t size, off_t offset, FREE *free_func) { - assert (0); + debug(79, 3) ("storeAufsWrite: FD %d\n", fd); } bool @@ -279,20 +279,15 @@ void squidaiostate_t::write(char *buf, size_t size, off_t offset, FREE * free_func) { - debug(79, 3) ("storeAufsWrite: dirno %d, fileno %08X, FD %d\n", - swap_dirn, swap_filen, fd); - if (!theFile->canWrite()) { - /* disk file not opened yet */ - assert(creating || writing); - queueWrite(buf, size, offset, free_func); - return; - } -#if ASYNC_WRITE + debug(79, 3) ("storeAufsWrite: dirno %d, fileno %08X\n", + swap_dirn, swap_filen); if (!theFile->canWrite() || writing) { + assert(creating || writing); queueWrite(buf, size, offset, free_func); return; } writing = true; +#if ASYNC_WRITE aioWrite(fd, offset, buf, size, storeAufsWriteDone, this, free_func); #else