diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-11 19:46:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-11 19:46:48 -0700 |
| commit | c3adefb5baf377868f45de78eb9f72f87eb498b0 (patch) | |
| tree | b8c28f6c71bc3efa2229234cead663e050234b37 /drivers/md/dm-writecache.c | |
| parent | 7ce2aa6d7fe121e243e1c8a8093911fecdf1c88e (diff) | |
| parent | e3a7c2947b9e01b9cedd3f67849c0ae95f0fadfa (diff) | |
| download | linux-c3adefb5baf377868f45de78eb9f72f87eb498b0.tar.gz linux-c3adefb5baf377868f45de78eb9f72f87eb498b0.tar.bz2 linux-c3adefb5baf377868f45de78eb9f72f87eb498b0.zip | |
Merge tag 'for-6.0/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
Pull device mapper fixes from Mike Snitzer:
- A few fixes for the DM verity and bufio changes in this merge window
- A smatch warning fix for DM writecache locking in writecache_map
* tag 'for-6.0/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
dm bufio: fix some cases where the code sleeps with spinlock held
dm writecache: fix smatch warning about invalid return from writecache_map
dm verity: fix verity_parse_opt_args parsing
dm verity: fix DM_VERITY_OPTS_MAX value yet again
dm bufio: simplify DM_BUFIO_CLIENT_NO_SLEEP locking
Diffstat (limited to 'drivers/md/dm-writecache.c')
| -rw-r--r-- | drivers/md/dm-writecache.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c index 1fc161d65673..96a003eb7323 100644 --- a/drivers/md/dm-writecache.c +++ b/drivers/md/dm-writecache.c @@ -1594,7 +1594,8 @@ done: default: BUG(); - return -1; + wc_unlock(wc); + return DM_MAPIO_KILL; } } |