Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 10:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block: remove the update_bdev parameter to set_capacity_revalidate_and_notify

Browse Source 
The update_bdev argument is always set to true, so remove it.  Also
rename the function to the slighly less verbose set_capacity_and_notify,
as propagating the disk size to the block device isn't really
revalidation.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2020-11-16 15:56:56 +01:00 committed by Jens Axboe
parent b200e38c49
commit 449f4ec989
7 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
block/genhd.c
View File

@ -47,17 +47,15 @@ static void disk_del_events(struct gendisk *disk);
static void disk_release_events(struct gendisk *disk); static void disk_release_events(struct gendisk *disk);
/* /*
* Set disk capacity and notify if the size is not currently * Set disk capacity and notify if the size is not currently zero and will not
* zero and will not be set to zero * be set to zero. Returns true if a uevent was sent, otherwise false.
*/ */
bool set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size, bool set_capacity_and_notify(struct gendisk *disk, sector_t size)
bool update_bdev)
{ {
sector_t capacity = get_capacity(disk); sector_t capacity = get_capacity(disk);
set_capacity(disk, size); set_capacity(disk, size);
if (update_bdev) revalidate_disk_size(disk, true);
revalidate_disk_size(disk, true);
if (capacity != size && capacity != 0 && size != 0) { if (capacity != size && capacity != 0 && size != 0) {
char *envp[] = { "RESIZE=1", NULL }; char *envp[] = { "RESIZE=1", NULL };
@ -68,8 +66,7 @@ bool set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,
return false; return false;
} }
EXPORT_SYMBOL_GPL(set_capacity_and_notify);
EXPORT_SYMBOL_GPL(set_capacity_revalidate_and_notify);
/* /*
* Format the device name of the indicated disk into the supplied buffer and * Format the device name of the indicated disk into the supplied buffer and

2
drivers/block/loop.c
View File

@ -251,7 +251,7 @@ loop_validate_block_size(unsigned short bsize)
*/ */
static void loop_set_size(struct loop_device *lo, loff_t size) static void loop_set_size(struct loop_device *lo, loff_t size)
{ {
if (!set_capacity_revalidate_and_notify(lo->lo_disk, size, true)) if (!set_capacity_and_notify(lo->lo_disk, size))
kobject_uevent(&disk_to_dev(lo->lo_disk)->kobj, KOBJ_CHANGE); kobject_uevent(&disk_to_dev(lo->lo_disk)->kobj, KOBJ_CHANGE);
} }

2
drivers/block/virtio_blk.c
View File

@ -470,7 +470,7 @@ static void virtblk_update_capacity(struct virtio_blk *vblk, bool resize)
cap_str_10, cap_str_10,
cap_str_2); cap_str_2);
set_capacity_revalidate_and_notify(vblk->disk, capacity, true); set_capacity_and_notify(vblk->disk, capacity);
} }
static void virtblk_config_changed_work(struct work_struct *work) static void virtblk_config_changed_work(struct work_struct *work)

2
drivers/block/xen-blkfront.c
View File

@ -2370,7 +2370,7 @@ static void blkfront_connect(struct blkfront_info *info)
return; return;
printk(KERN_INFO "Setting capacity to %Lu\n", printk(KERN_INFO "Setting capacity to %Lu\n",
sectors); sectors);
set_capacity_revalidate_and_notify(info->gd, sectors, true); set_capacity_and_notify(info->gd, sectors);
return; return;
case BLKIF_STATE_SUSPENDED: case BLKIF_STATE_SUSPENDED:

2
drivers/nvme/host/core.c
View File

@ -2053,7 +2053,7 @@ static void nvme_update_disk_info(struct gendisk *disk,
capacity = 0; capacity = 0;
} }
set_capacity_revalidate_and_notify(disk, capacity, true); set_capacity_and_notify(disk, capacity);
nvme_config_discard(disk, ns); nvme_config_discard(disk, ns);
nvme_config_write_zeroes(disk, ns); nvme_config_write_zeroes(disk, ns);

5
drivers/scsi/sd.c
View File

@ -3261,8 +3261,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
sdkp->first_scan = 0; sdkp->first_scan = 0;
set_capacity_revalidate_and_notify(disk, set_capacity_and_notify(disk, logical_to_sectors(sdp, sdkp->capacity));
logical_to_sectors(sdp, sdkp->capacity), true);
sd_config_write_same(sdkp); sd_config_write_same(sdkp);
kfree(buffer); kfree(buffer);
@ -3272,7 +3271,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
* capacity to 0. * capacity to 0.
*/ */
if (sd_zbc_revalidate_zones(sdkp)) if (sd_zbc_revalidate_zones(sdkp))
set_capacity_revalidate_and_notify(disk, 0, true); set_capacity_and_notify(disk, 0);
out: out:
return 0; return 0;

3
include/linux/genhd.h
View File

@ -314,8 +314,7 @@ static inline int get_disk_ro(struct gendisk *disk)
extern void disk_block_events(struct gendisk *disk); extern void disk_block_events(struct gendisk *disk);
extern void disk_unblock_events(struct gendisk *disk); extern void disk_unblock_events(struct gendisk *disk);
extern void disk_flush_events(struct gendisk *disk, unsigned int mask); extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
bool set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size, bool set_capacity_and_notify(struct gendisk *disk, sector_t size);
bool update_bdev);
/* drivers/char/random.c */ /* drivers/char/random.c */
extern void add_disk_randomness(struct gendisk *disk) __latent_entropy; extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;