TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "block: genhd: add 'groups' argument to device_add_disk"

Browse Source 
This reverts commit 1bf6a186c4.

The patch series submitted for the 4.19-stable branch:
	https://lore.kernel.org/r/20210223092859.17033-1-jefflexu@linux.alibaba.com
should be reverted from the android-4.19-stable branch as it breaks the
ABI for device_add_disk() and the issue the series is resolving does not
affect Android devices.  So revert the whole thing.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If2f890a6682dad1d6b0d532d35bc13fe3b8a31a9
This commit is contained in:
Greg Kroah-Hartman
2021-03-11 17:01:03 +01:00
parent 468b80238b
commit 022059b0c5
28 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3211,7 +3211,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
nvme_get_ctrl(ctrl);
device_add_disk(ctrl->device, ns->disk, NULL);
device_add_disk(ctrl->device, ns->disk);
if (sysfs_create_group(&disk_to_dev(ns->disk)->kobj,
&nvme_ns_id_attr_group))
pr_warn("%s: failed to create sysfs group for identification\n",