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

!7194 s390/dasd: fix double module refcount decrement 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Zhongjin <chenzhongjin@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JZERKEEUP47HBUGJEYBFXH3CO6R5FRSV/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L9NF 
 
Link:https://gitee.com/openeuler/kernel/pulls/7194

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 819e21d7 55c326d9

drivers/s390/block/dasd.c

+1 −4
Original line number Diff line number Diff line
@@ -3501,12 +3501,11 @@ int dasd_generic_set_online(struct ccw_device *cdev, 
		dasd_delete_device(device);

		return -EINVAL;

	}

	device->base_discipline = base_discipline;

	if (!try_module_get(discipline->owner)) {

		module_put(base_discipline->owner);

		dasd_delete_device(device);

		return -EINVAL;

	}

	device->base_discipline = base_discipline;

	device->discipline = discipline;



	/* check_device will allocate block device if necessary */
@@ -3514,8 +3513,6 @@ int dasd_generic_set_online(struct ccw_device *cdev, 
	if (rc) {

		pr_warn("%s Setting the DASD online with discipline %s failed with rc=%i\n",

			dev_name(&cdev->dev), discipline->name, rc);

		module_put(discipline->owner);

		module_put(base_discipline->owner);

		dasd_delete_device(device);

		return rc;

	}