diff options
author | Christoph Hellwig <hch@lst.de> | 2019-11-14 15:34:33 +0100 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2019-11-14 07:42:41 -0700 |
commit | 6917d0689993f46d97d40dd66c601d0fd5b1dbdd (patch) | |
tree | 176dd2f6fa009a8ab3bd5181afc2f3ed71888e21 /block/ioctl.c | |
parent | f902b02600028dfc0c9df811eb711ac7d7fca09f (diff) | |
download | linux-stable-6917d0689993f46d97d40dd66c601d0fd5b1dbdd.tar.gz linux-stable-6917d0689993f46d97d40dd66c601d0fd5b1dbdd.tar.bz2 linux-stable-6917d0689993f46d97d40dd66c601d0fd5b1dbdd.zip |
block: merge invalidate_partitions into rescan_partitions
A lot of the logic in invalidate_partitions and rescan_partitions is
shared. Merge the two functions to simplify things. There is a small
behavior change in that we now send the kevent change notice also if we
were not invalidating but no partitions were found, which seems like
the right thing to do.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/ioctl.c')
-rw-r--r-- | block/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index 8756efb1419e..f6576a6d5778 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -171,7 +171,7 @@ int __blkdev_reread_part(struct block_device *bdev) lockdep_assert_held(&bdev->bd_mutex); - return rescan_partitions(disk, bdev); + return rescan_partitions(disk, bdev, false); } EXPORT_SYMBOL(__blkdev_reread_part); |