From 677e7a0554b536b63106e1bd19f1e81a70626894 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Sat, 8 Aug 2015 00:10:44 +0900 Subject: [PATCH] sys/vfs/hammer: Cleanup volume format callback Apply the same code logic as volume free callback. No need to wait for ready-to-update-layer1-case to increment total_free_bigblocks via counter variable, as it has nothing to do with generating layer1 undo. --- sys/vfs/hammer/hammer_volume.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/vfs/hammer/hammer_volume.c b/sys/vfs/hammer/hammer_volume.c index 4f6e534da3..8fb5cba8b9 100644 --- a/sys/vfs/hammer/hammer_volume.c +++ b/sys/vfs/hammer/hammer_volume.c @@ -623,8 +623,6 @@ format_callback(hammer_transaction_t trans, hammer_volume_t volume, layer1->blocks_free = stat->counter; layer1->layer1_crc = crc32(layer1, HAMMER_LAYER1_CRCSIZE); hammer_modify_buffer_done(*bufferp); - - stat->total_free_bigblocks += stat->counter; stat->counter = 0; /* reset */ } else if (layer2) { hammer_modify_buffer(trans, *bufferp, layer2, sizeof(*layer2)); @@ -650,6 +648,7 @@ format_callback(hammer_transaction_t trans, hammer_volume_t volume, layer2->append_off = 0; layer2->bytes_free = HAMMER_BIGBLOCK_SIZE; ++stat->total_bigblocks; + ++stat->total_free_bigblocks; ++stat->counter; } else { /* -- 2.41.0