btrfs: clean up locking name in scrub_enumerate_chunks() (3ec17a67) · Commits · 戴 / test

The "&fs_info->dev_replace.rwsem" and "&dev_replace->rwsem" refer to the same lock but Smatch is not clever enough to figure that out so it leads to static checker warnings. It's better to use it consistently anyway. Signed-off-by:

Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by:

David Sterba <dsterba@suse.com> Signed-off-by:

David Sterba <dsterba@suse.com>

fs/btrfs/scrub.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -3620,7 +3620,7 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,
		break;
		}

		down_write(&fs_info->dev_replace.rwsem);
		down_write(&dev_replace->rwsem);
		dev_replace->cursor_right = found_key.offset + length;
		dev_replace->cursor_left = found_key.offset;
		dev_replace->item_needs_writeback = 1;
		@@ -3661,10 +3661,10 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,

		scrub_pause_off(fs_info);

		down_write(&fs_info->dev_replace.rwsem);
		down_write(&dev_replace->rwsem);
		dev_replace->cursor_left = dev_replace->cursor_right;
		dev_replace->item_needs_writeback = 1;
		up_write(&fs_info->dev_replace.rwsem);
		up_write(&dev_replace->rwsem);

		if (ro_set)
		btrfs_dec_block_group_ro(cache);

Admin message