block: add a return value to set_capacity_revalidate_and_notify

Christoph Hellwig · axboe · commit 7e890c37c25c · 2020-11-12T13:59:04.000-07:00
Return if the function ended up sending an uevent or not.

Cc: stable@vger.kernel.org # v5.9
Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Reviewed-by: Petr Vorel &lt;pvorel@suse.cz&gt;
Signed-off-by: Jens Axboe &lt;axboe@kernel.dk&gt;
diff --git a/block/genhd.c b/block/genhd.c
@@ -49,7 +49,7 @@ static void disk_release_events(struct gendisk *disk);
  * Set disk capacity and notify if the size is not currently
  * zero and will not be set to zero
  */
-void set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,
+bool set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,
 					bool update_bdev)
 {
 	sector_t capacity = get_capacity(disk);
@@ -62,7 +62,10 @@ void set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,
 		char *envp[] = { "RESIZE=1", NULL };
 
 		kobject_uevent_env(&disk_to_dev(disk)->kobj, KOBJ_CHANGE, envp);
+		return true;
 	}
+
+	return false;
 }
 
 EXPORT_SYMBOL_GPL(set_capacity_revalidate_and_notify);
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
@@ -315,7 +315,7 @@ static inline int get_disk_ro(struct gendisk *disk)
 extern void disk_block_events(struct gendisk *disk);
 extern void disk_unblock_events(struct gendisk *disk);
 extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
-void set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,
+bool set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,
 		bool update_bdev);
 
 /* drivers/char/random.c */

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ static void disk_release_events(struct gendisk *disk);`
`49`	`49`	`* Set disk capacity and notify if the size is not currently`
`50`	`50`	`* zero and will not be set to zero`
`51`	`51`	`*/`
`52`		`-void set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,`
	`52`	`+bool set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,`
`53`	`53`	`bool update_bdev)`
`54`	`54`	`{`
`55`	`55`	`sector_t capacity = get_capacity(disk);`
`@@ -62,7 +62,10 @@ void set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,`
`62`	`62`	`char *envp[] = { "RESIZE=1", NULL };`
`63`	`63`
`64`	`64`	`kobject_uevent_env(&disk_to_dev(disk)->kobj, KOBJ_CHANGE, envp);`
	`65`	`+ return true;`
`65`	`66`	`}`
	`67`	`+`
	`68`	`+ return false;`
`66`	`69`	`}`
`67`	`70`
`68`	`71`	`EXPORT_SYMBOL_GPL(set_capacity_revalidate_and_notify);`