Now there is a clear semantic distinction between deferred and immediate
deallocations. Deferred mode is used to deallocate blocks that were previously
written, immediate mode is used to deallocate "just allocated" blocks in error
paths or if some previously allocated blocks turn out to be unneeded.
This way, we may get rid of discard-related hack in the deallocation routine,
i. e. treating immediate deallocations as deferred (which messes up
block accounting). This is done in the next commit.
Signed-off-by: Ivan Shapovalov <intelfx100@xxxxxxxxx>
---
fs/reiser4/wander.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/reiser4/wander.c b/fs/reiser4/wander.c
index 04ddec6..fd5954a 100644
--- a/fs/reiser4/wander.c
+++ b/fs/reiser4/wander.c
@@ -482,8 +482,8 @@ static void dealloc_tx_list(struct commit_handle *ch)
jnode *cur = list_entry(ch->tx_list.next, jnode, capture_link);
list_del(&cur->capture_link);
ON_DEBUG(INIT_LIST_HEAD(&cur->capture_link));
- reiser4_dealloc_block(jnode_get_block(cur), BLOCK_NOT_COUNTED,
- BA_FORMATTED);
+ reiser4_dealloc_block(jnode_get_block(cur), 0,
+ BA_DEFER | BA_FORMATTED);
unpin_jnode_data(cur);
reiser4_drop_io_head(cur);
@@ -502,7 +502,7 @@ dealloc_wmap_actor(txn_atom * atom UNUSED_ARG,
assert("zam-500", *b != 0);
assert("zam-501", !reiser4_blocknr_is_fake(b));
- reiser4_dealloc_block(b, BLOCK_NOT_COUNTED, BA_FORMATTED);
+ reiser4_dealloc_block(b, 0, BA_DEFER | BA_FORMATTED);
return 0;
}
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
