Unverified Commit a691480d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8360 v2 loop: use lo->lo_disk for kobject_uevent 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/245GLYATQCUI7JQHLSHQZVYRTK2V5XDH/ 
 
https://gitee.com/openeuler/kernel/issues/I9PXKA 
 
Link:https://gitee.com/openeuler/kernel/pulls/8360

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents b5c8094a 60050273

drivers/block/loop.c

+3 −3
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit) 
	set_capacity(lo->lo_disk, x);

	bd_set_size(bdev, (loff_t)get_capacity(bdev->bd_disk) << 9);

	/* let user-space know about the new size */

	kobject_uevent(&disk_to_dev(bdev->bd_disk)->kobj, KOBJ_CHANGE);

	kobject_uevent(&disk_to_dev(lo->lo_disk)->kobj, KOBJ_CHANGE);

	return 0;

}
@@ -1002,7 +1002,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, 
	bd_set_size(bdev, size << 9);

	loop_sysfs_init(lo);

	/* let user-space know about the new size */

	kobject_uevent(&disk_to_dev(bdev->bd_disk)->kobj, KOBJ_CHANGE);

	kobject_uevent(&disk_to_dev(lo->lo_disk)->kobj, KOBJ_CHANGE);



	set_blocksize(bdev, S_ISBLK(inode->i_mode) ?

		      block_size(inode->i_bdev) : PAGE_SIZE);
@@ -1123,7 +1123,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) 
	if (bdev) {

		bd_set_size(bdev, 0);

		/* let user-space know about this change */

		kobject_uevent(&disk_to_dev(bdev->bd_disk)->kobj, KOBJ_CHANGE);

		kobject_uevent(&disk_to_dev(lo->lo_disk)->kobj, KOBJ_CHANGE);

	}

	mapping_set_gfp_mask(filp->f_mapping, gfp);

	/* This is safe: open() is still holding a reference. */