Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6af38473 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'stable/for-jens-4.12' of... 

Merge branch 'stable/for-jens-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-4.12/block

Konrad writes:

It has one fix - to emit an uevent whenever the size of the guest disk image
changes.
parents a2c97909 89515d02

drivers/block/xen-blkfront.c

+3 −0
Original line number Diff line number Diff line
@@ -2345,6 +2345,7 @@ static void blkfront_connect(struct blkfront_info *info) 
	unsigned long sector_size;

	unsigned int physical_sector_size;

	unsigned int binfo;

	char *envp[] = { "RESIZE=1", NULL };

	int err, i;



	switch (info->connected) {
@@ -2361,6 +2362,8 @@ static void blkfront_connect(struct blkfront_info *info) 
		       sectors);

		set_capacity(info->gd, sectors);

		revalidate_disk(info->gd);

		kobject_uevent_env(&disk_to_dev(info->gd)->kobj,

				   KOBJ_CHANGE, envp);



		return;

	case BLKIF_STATE_SUSPENDED: