summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Thornber <ejt@redhat.com>2013-08-09 14:19:32 +0100
committerMike Snitzer <snitzer@redhat.com>2013-11-09 18:20:24 -0500
commit40c57f475f416ab241124e1e6a593b2f982eaae3 (patch)
tree1d15b08035b871d9fd2fab9df882fdef68330ab1
parent41d35d25e9d4e1b5e944b70f1bec272bcff5f489 (diff)
downloadop-kernel-dev-40c57f475f416ab241124e1e6a593b2f982eaae3.zip
op-kernel-dev-40c57f475f416ab241124e1e6a593b2f982eaae3.tar.gz
dm space map disk: optimise sm_disk_dec_block
Don't waste time spotting blocks that have been allocated and then freed in the same transaction. The extra lookup is expensive, and I don't think it really gives us much. Signed-off-by: Joe Thornber <ejt@redhat.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-rw-r--r--drivers/md/persistent-data/dm-space-map-disk.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
index e735a6d..cfbf961 100644
--- a/drivers/md/persistent-data/dm-space-map-disk.c
+++ b/drivers/md/persistent-data/dm-space-map-disk.c
@@ -140,26 +140,10 @@ static int sm_disk_inc_block(struct dm_space_map *sm, dm_block_t b)
static int sm_disk_dec_block(struct dm_space_map *sm, dm_block_t b)
{
- int r;
- uint32_t old_count;
enum allocation_event ev;
struct sm_disk *smd = container_of(sm, struct sm_disk, sm);
- r = sm_ll_dec(&smd->ll, b, &ev);
- if (!r && (ev == SM_FREE)) {
- /*
- * It's only free if it's also free in the last
- * transaction.
- */
- r = sm_ll_lookup(&smd->old_ll, b, &old_count);
- if (r)
- return r;
-
- if (!old_count)
- smd->nr_allocated_this_transaction--;
- }
-
- return r;
+ return sm_ll_dec(&smd->ll, b, &ev);
}
static int sm_disk_new_block(struct dm_space_map *sm, dm_block_t *b)
OpenPOWER on IntegriCloud