xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev: Factor out bdev revalidation into a common helper

Browse Source 
Factor out code handling revalidation of bdev on disk change into a
common helper.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jan Kara
2019-10-21 10:37:59 +02:00
committed by Jens Axboe
parent 8962842ca5
commit 731dc48683
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fs/block_dev.c
View File

@@ -1512,6 +1512,14 @@ EXPORT_SYMBOL(bd_set_size);
static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part); static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part);
static void bdev_disk_changed(struct block_device *bdev, bool invalidate)
{
if (invalidate)
invalidate_partitions(bdev->bd_disk, bdev);
else
rescan_partitions(bdev->bd_disk, bdev);
}
/* /*
* bd_mutex locking: * bd_mutex locking:
* *
@@ -1594,12 +1602,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
* The latter is necessary to prevent ghost * The latter is necessary to prevent ghost
* partitions on a removed medium. * partitions on a removed medium.
*/ */
if (bdev->bd_invalidated) { if (bdev->bd_invalidated &&
if (!ret) (!ret || ret == -ENOMEDIUM))
rescan_partitions(disk, bdev); bdev_disk_changed(bdev, ret == -ENOMEDIUM);
else if (ret == -ENOMEDIUM)
invalidate_partitions(disk, bdev);
}
if (ret) if (ret)
goto out_clear; goto out_clear;
@@ -1632,12 +1637,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
if (bdev->bd_disk->fops->open) if (bdev->bd_disk->fops->open)
ret = bdev->bd_disk->fops->open(bdev, mode); ret = bdev->bd_disk->fops->open(bdev, mode);
/* the same as first opener case, read comment there */ /* the same as first opener case, read comment there */
if (bdev->bd_invalidated) { if (bdev->bd_invalidated &&
if (!ret) (!ret || ret == -ENOMEDIUM))
rescan_partitions(bdev->bd_disk, bdev); bdev_disk_changed(bdev, ret == -ENOMEDIUM);
else if (ret == -ENOMEDIUM)
invalidate_partitions(bdev->bd_disk, bdev);
}
if (ret) if (ret)
goto out_unlock_bdev; goto out_unlock_bdev;
} }