From: Huaisheng Ye <yehs1@xxxxxxxxxx>
writecache_flush_region doesn't use size to calculate flush region.
That uses _set_bits to mark the region in dirty_bitmap directly.
Signed-off-by: Huaisheng Ye <yehs1@xxxxxxxxxx>
---
drivers/md/dm-writecache.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
index 2d50eec..2d8e0c0 100644
--- a/drivers/md/dm-writecache.c
+++ b/drivers/md/dm-writecache.c
@@ -418,7 +418,7 @@ static void writecache_flush_all_metadata(struct dm_writecache *wc)
memset(wc->dirty_bitmap, -1, wc->dirty_bitmap_size);
}
-static void writecache_flush_region(struct dm_writecache *wc, void *ptr, size_t size)
+static void writecache_flush_region(struct dm_writecache *wc, void *ptr)
{
if (!WC_MODE_PMEM(wc))
__set_bit(((char *)ptr - (char *)wc->memory_map) / BITMAP_GRANULARITY,
@@ -657,7 +657,7 @@ static void writecache_free_entry(struct dm_writecache *wc, struct wc_entry *e)
writecache_unlink(wc, e);
writecache_add_to_freelist(wc, e);
clear_seq_count(wc, e);
- writecache_flush_region(wc, memory_entry(wc, e), sizeof(struct wc_memory_entry));
+ writecache_flush_region(wc, memory_entry(wc, e));
if (unlikely(waitqueue_active(&wc->freelist_wait)))
wake_up(&wc->freelist_wait);
}
@@ -687,9 +687,9 @@ static void writecache_poison_lists(struct dm_writecache *wc)
static void writecache_flush_entry(struct dm_writecache *wc, struct wc_entry *e)
{
- writecache_flush_region(wc, memory_entry(wc, e), sizeof(struct wc_memory_entry));
+ writecache_flush_region(wc, memory_entry(wc, e));
if (WC_MODE_PMEM(wc))
- writecache_flush_region(wc, memory_data(wc, e), wc->block_size);
+ writecache_flush_region(wc, memory_data(wc, e));
}
static bool writecache_entry_is_committed(struct dm_writecache *wc, struct wc_entry *e)
@@ -733,7 +733,7 @@ static void writecache_flush(struct dm_writecache *wc)
wc->seq_count++;
pmem_assign(sb(wc)->seq_count, cpu_to_le64(wc->seq_count));
- writecache_flush_region(wc, &sb(wc)->seq_count, sizeof sb(wc)->seq_count);
+ writecache_flush_region(wc, &sb(wc)->seq_count);
writecache_commit_flushed(wc);
wc->overwrote_committed = false;
@@ -1757,7 +1757,7 @@ static int init_memory(struct dm_writecache *wc)
writecache_flush_all_metadata(wc);
writecache_commit_flushed(wc);
pmem_assign(sb(wc)->magic, cpu_to_le32(MEMORY_SUPERBLOCK_MAGIC));
- writecache_flush_region(wc, &sb(wc)->magic, sizeof sb(wc)->magic);
+ writecache_flush_region(wc, &sb(wc)->magic);
writecache_commit_flushed(wc);
return 0;
--
1.8.3.1
