Skip to contentSkip to conversation

zram-use-attribute_groups.patch removed from -mm tree

merged [email protected] 1 participant 1 message Jan 20, 2022

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: zram: use ATTRIBUTE_GROUPS
has been removed from the -mm tree. Its filename was
zram-use-attribute_groups.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Luis Chamberlain <[email protected]>
Subject: zram: use ATTRIBUTE_GROUPS

Embrace ATTRIBUTE_GROUPS to avoid boiler plate code. This should not introduce any functional changes.

---

 drivers/block/zram/zram_drv.c |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/block/zram/zram_drv.c renamed from drivers/block/zram/zram_drv.c~zram-use-attribute_groups +2 -9
@@ -1903,14 +1903,7 @@ static struct attribute *zram_disk_attrs
 	NULL,
 };
 
-static const struct attribute_group zram_disk_attr_group = {
-	.attrs = zram_disk_attrs,
-};
-
-static const struct attribute_group *zram_disk_attr_groups[] = {
-	&zram_disk_attr_group,
-	NULL,
-};
+ATTRIBUTE_GROUPS(zram_disk);
 
 /*
  * Allocate and initialize new zram device. the function returns
@@ -1982,7 +1975,7 @@ static int zram_add(void)
 		blk_queue_max_write_zeroes_sectors(zram->disk->queue, UINT_MAX);
 
 	blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, zram->disk->queue);
-	ret = device_add_disk(NULL, zram->disk, zram_disk_attr_groups);
+	ret = device_add_disk(NULL, zram->disk, zram_disk_groups);
 	if (ret)
 		goto out_cleanup_disk;
 

_

Patches currently in -mm which might be from [email protected] are

hpet-simplify-subdirectory-registration-with-register_sysctl.patch i915-simplify-subdirectory-registration-with-register_sysctl.patch macintosh-mac_hidc-simplify-subdirectory-registration-with-register_sysctl.patch ocfs2-simplify-subdirectory-registration-with-register_sysctl.patch test_sysctl-simplify-subdirectory-registration-with-register_sysctl.patch inotify-simplify-subdirectory-registration-with-register_sysctl-fix.patch cdrom-simplify-subdirectory-registration-with-register_sysctl.patch sysctl-add-helper-to-register-a-sysctl-mount-point.patch fs-move-binfmt_misc-sysctl-to-its-own-file.patch sysctl-share-unsigned-long-const-values.patch fs-move-inode-sysctls-to-its-own-file.patch fs-move-fs-stat-sysctls-to-file_tablec.patch fs-move-dcache-sysctls-to-its-own-file.patch sysctl-move-maxolduid-as-a-sysctl-specific-const.patch fs-move-shared-sysctls-to-fs-sysctlsc.patch fs-move-locking-sysctls-where-they-are-used.patch fs-move-namei-sysctls-to-its-own-file.patch fs-move-fs-execc-sysctls-into-its-own-file.patch fs-move-pipe-sysctls-to-is-own-file.patch sysctl-add-and-use-base-directory-declarer-and-registration-helper.patch sysctl-add-and-use-base-directory-declarer-and-registration-helper-fix.patch fs-move-namespace-sysctls-and-declare-fs-base-directory.patch kernel-sysctlc-rename-sysctl_init-to-sysctl_init_bases.patch