Merge tag 'dm-4.6-fix-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fix from Mike Snitzer: "Fix for earlier 4.6-rc4 stable@ commit that introduced improper use of write lock in cmd_read_lock() -- due to cut-n-paste gone awry (and sparse didn't catch it)" * tag 'dm-4.6-fix-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: dm cache metadata: fix cmd_read_lock() acquiring write lock

Linus Torvalds committed 10 years ago

Commit 9d090d02 parents b9f5dba 6545b601 file · +2 −2Browse files

Unified · Split

drivers/md/dm-cache-metadata.c+2−2

@@ -894,9 +894,9 @@ static bool cmd_write_lock(struct dm_cache_metadata *cmd) · 893 unmodified lines
894	894
895	895	static bool cmd_read_lock(struct dm_cache_metadata *cmd)
896	896	{
897		− down_write(&cmd->root_lock);
	897	+ down_read(&cmd->root_lock);
898	898	if (cmd->fail_io) {
899		− up_write(&cmd->root_lock);
	899	+ up_read(&cmd->root_lock);
900	900	return false;
901	901	}
902	902	return true;