Commit 0d963b6e authored by Joe Thornber's avatar Joe Thornber Committed by Mike Snitzer
Browse files

dm cache metadata: fix metadata2 format's blocks_are_clean_separate_dirty

The dm_bitset_cursor_begin() call was using the incorrect nr_entries.
Also, the last dm_bitset_cursor_next() must be avoided if we're at the
end of the cursor.

Fixes: 7f1b2159

 ("dm cache metadata: use cursor api in blocks_are_clean_separate_dirty()")
Signed-off-by: default avatarJoe Thornber <>
Signed-off-by: default avatarMike Snitzer <>
parent f1a880a9
......@@ -932,7 +932,7 @@ static int blocks_are_clean_separate_dirty(struct dm_cache_metadata *cmd,
*result = true;
r = dm_bitset_cursor_begin(&cmd->dirty_info, cmd->dirty_root,
from_cblock(begin), &cmd->dirty_cursor);
from_cblock(cmd->cache_blocks), &cmd->dirty_cursor);
if (r) {
DMERR("%s: dm_bitset_cursor_begin for dirty failed", __func__);
return r;
......@@ -959,14 +959,16 @@ static int blocks_are_clean_separate_dirty(struct dm_cache_metadata *cmd,
return 0;
begin = to_cblock(from_cblock(begin) + 1);
if (begin == end)
r = dm_bitset_cursor_next(&cmd->dirty_cursor);
if (r) {
DMERR("%s: dm_bitset_cursor_next for dirty failed", __func__);
return r;
begin = to_cblock(from_cblock(begin) + 1);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment