The patch titled Fix container_of() usage has been added to the -mm tree. Its filename is fixup-container_of-usage.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: Fix container_of() usage From: Alexey Dobriyan <adobriyan@xxxxx> Using "attr" twice is not OK, because it effectively prohibits such container_of() on variables not named "attr". Signed-off-by: Alexey Dobriyan <adobriyan@xxxxx> Acked-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/sh/kernel/cpu/sh4/sq.c | 2 +- drivers/lguest/lguest_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/sh/kernel/cpu/sh4/sq.c~fixup-container_of-usage arch/sh/kernel/cpu/sh4/sq.c --- a/arch/sh/kernel/cpu/sh4/sq.c~fixup-container_of-usage +++ a/arch/sh/kernel/cpu/sh4/sq.c @@ -263,7 +263,7 @@ struct sq_sysfs_attr { ssize_t (*store)(const char *buf, size_t count); }; -#define to_sq_sysfs_attr(attr) container_of(attr, struct sq_sysfs_attr, attr) +#define to_sq_sysfs_attr(a) container_of(a, struct sq_sysfs_attr, attr) static ssize_t sq_sysfs_show(struct kobject *kobj, struct attribute *attr, char *buf) diff -puN drivers/lguest/lguest_device.c~fixup-container_of-usage drivers/lguest/lguest_device.c --- a/drivers/lguest/lguest_device.c~fixup-container_of-usage +++ a/drivers/lguest/lguest_device.c @@ -47,7 +47,7 @@ struct lguest_device { /* Since the virtio infrastructure hands us a pointer to the virtio_device all * the time, it helps to have a curt macro to get a pointer to the struct * lguest_device it's enclosed in. */ -#define to_lgdev(vdev) container_of(vdev, struct lguest_device, vdev) +#define to_lgdev(vd) container_of(vd, struct lguest_device, vdev) /*D:130 * Device configurations _ Patches currently in -mm which might be from adobriyan@xxxxx are gregkh-driver-block-device-genhd-fixup-kobj_to_dev-macro.patch gregkh-driver-kobject-convert-hvcs-to-use-kref-not-kobject-hvcs-fixup-container_of-usage.patch proc-remove-module_license.patch proc-less-lock-operations-during-lookup.patch proc-simplify-function-prototypes.patch proc-remove-useless-check-on-symlink-removal.patch proc-remove-useless-checks-in-proc_register.patch proc-detect-duplicate-names-on-registration.patch proc-detect-duplicate-names-on-registration-fix.patch fixup-container_of-usage.patch single_open-seq_release-leak-diagnostics.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html