Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BlockWriter: Do not panic on failing read/writes

Browse Source 
These were here for debugging purposes, as often it is a sign of
inconsistencies. However, for USB disks this is a normal occurence
when someone janks out of the device without unmounting first.

Make sure we log these cases though, as it still helps debugging.

Fix sponsered by http://www.izcorp.com
This commit is contained in:
Ithamar R. Adema 2015-03-30 19:23:07 +02:00
parent f1a02a8e1e
commit efdcada6f3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/system/kernel/cache/block_cache.cpp vendored
View File

@ -40,6 +40,8 @@
# define TRACE(x) ; # define TRACE(x) ;
#endif #endif
#define TRACE_ALWAYS(x) dprintf x
// This macro is used for fatal situations that are acceptable in a running // This macro is used for fatal situations that are acceptable in a running
// system, like out of memory situations - should only panic for debugging. // system, like out of memory situations - should only panic for debugging.
#define FATAL(x) panic x #define FATAL(x) panic x
@ -1239,7 +1241,7 @@ BlockWriter::_WriteBlock(cached_block* block)
if (written != (ssize_t)blockSize) { if (written != (ssize_t)blockSize) {
TB(Error(fCache, block->block_number, "write failed", written)); TB(Error(fCache, block->block_number, "write failed", written));
FATAL(("could not write back block %" B_PRIdOFF " (%s)\n", block->block_number, TRACE_ALWAYS(("could not write back block %" B_PRIdOFF " (%s)\n", block->block_number,
strerror(errno))); strerror(errno)));
if (written < 0) if (written < 0)
return errno; return errno;
@ -1902,7 +1904,7 @@ retry:
cache->RemoveBlock(block); cache->RemoveBlock(block);
TB(Error(cache, blockNumber, "read failed", bytesRead)); TB(Error(cache, blockNumber, "read failed", bytesRead));
FATAL(("could not read block %" B_PRIdOFF ": bytesRead: %zd, error: %s\n", TRACE_ALWAYS(("could not read block %" B_PRIdOFF ": bytesRead: %zd, error: %s\n",
blockNumber, bytesRead, strerror(errno))); blockNumber, bytesRead, strerror(errno)));
return NULL; return NULL;
} }