diff --git a/[refs] b/[refs] index 8491ae808b30..bfe530a04ccc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df457f845e5449be2e7d96668791f789b3770ac7 +refs/heads/master: facc31ddc3570a3a0d8951c94f16b898e01b464d diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c index 3e2b57b55e38..c91a2dac6b6b 100644 --- a/trunk/block/genhd.c +++ b/trunk/block/genhd.c @@ -1494,7 +1494,7 @@ void disk_block_events(struct gendisk *disk) void disk_unblock_events(struct gendisk *disk) { if (disk->ev) - __disk_unblock_events(disk, true); + __disk_unblock_events(disk, false); } /** diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c index 889287019599..fffdf86c1757 100644 --- a/trunk/fs/block_dev.c +++ b/trunk/fs/block_dev.c @@ -1446,6 +1446,7 @@ int blkdev_put(struct block_device *bdev, fmode_t mode) if (bdev_free) { if (bdev->bd_write_holder) { disk_unblock_events(bdev->bd_disk); + disk_check_events(bdev->bd_disk); bdev->bd_write_holder = false; } else disk_check_events(bdev->bd_disk);