i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed CID 1447 which was an actual bug which completely voided the whole

Browse Source 
discard mechanism eventually causing the conflicts between the file cache
  and the block cache it intended to fix.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38232 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-08-18 12:23:38 +00:00
parent 7ac6de66a4
commit c141a31f83
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/cache/block_cache.cpp
Vendored
+8 -2
View File
@@ -3382,15 +3382,21 @@ block_cache_sync_etc(void* _cache, off_t blockNumber, size_t numBlocks)
}
/*! Discards a block from the current transaction or from the cache.
You have to call this function when you no longer use a block, ie. when it
might be reclaimed by the file cache in order to make sure they won't
interfere.
*/
void
block_cache_discard(void* _cache, off_t blockNumber, size_t numBlocks)
{
// TODO: this could be a nice place to issue the ATA trim command
block_cache* cache = (block_cache*)_cache;
TransactionLocker locker(cache);
BlockWriter writer(cache);
for (; numBlocks > 0; numBlocks--, blockNumber++) {
for (size_t i = 0; i < numBlocks; i++, blockNumber++) {
cached_block* block = (cached_block*)hash_lookup(cache->hash,
&blockNumber);
if (block != NULL && block->previous_transaction != NULL)
@@ -3400,7 +3406,7 @@ block_cache_discard(void* _cache, off_t blockNumber, size_t numBlocks)
writer.Write();
// TODO: this can fail, too!
for (; numBlocks > 0; numBlocks--, blockNumber++) {
for (size_t i = 0; i < numBlocks; i++, blockNumber++) {
cached_block* block = (cached_block*)hash_lookup(cache->hash,
&blockNumber);
if (block == NULL)