summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-05-24 18:53:20 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-05-24 18:53:20 +0300
commitb68ea0ee0362e935a7b4627b9728f6cee95286d7 (patch)
tree932e10bb0731bd7019f58101956a0c9d129810f4 /drivers/block
parent9ca5a2ae4259e7aec8efb0db0f6ec721a6854c54 (diff)
parenteedffa28c9b00ca2dcb4d541b5a530f4c917052d (diff)
downloadlinux-b68ea0ee0362e935a7b4627b9728f6cee95286d7.tar.xz
Merge tag 'for-linus-20180524' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "Two fixes that should go into this release: - a loop writeback error clearing fix from Jeff - the sr sense fix from myself" * tag 'for-linus-20180524' of git://git.kernel.dk/linux-block: loop: clear wb_err in bd_inode when detaching backing file sr: pass down correctly sized SCSI sense buffer
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/loop.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 5d4e31655d96..55cf554bc914 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1068,6 +1068,7 @@ static int loop_clr_fd(struct loop_device *lo)
if (bdev) {
bdput(bdev);
invalidate_bdev(bdev);
+ bdev->bd_inode->i_mapping->wb_err = 0;
}
set_capacity(lo->lo_disk, 0);
loop_sysfs_exit(lo);