Commit 9d090d01 authored by Linus Torvalds's avatar Linus Torvalds

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
parents b9f5dba2 6545b60b
...@@ -894,9 +894,9 @@ static bool cmd_write_lock(struct dm_cache_metadata *cmd) ...@@ -894,9 +894,9 @@ static bool cmd_write_lock(struct dm_cache_metadata *cmd)
static bool cmd_read_lock(struct dm_cache_metadata *cmd) static bool cmd_read_lock(struct dm_cache_metadata *cmd)
{ {
down_write(&cmd->root_lock); down_read(&cmd->root_lock);
if (cmd->fail_io) { if (cmd->fail_io) {
up_write(&cmd->root_lock); up_read(&cmd->root_lock);
return false; return false;
} }
return true; return true;
......
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