2008-01-08 08:43:23

by Alexey Dobriyan

Subject: [PATCH -mm 1/4] genhd: fixup kobj_to_dev() macro

Please, fold into gregkh-driver-block-device.patch
-------------------------------------------------------
[PATCH -mm 1/4] genhd: fixup kobj_to_dev() macro

>From Pavel Emelyanov <[email protected]>

Using "kobj" twice is not OK, because substitution will be done twice
resulting in compile breakage if variable name is different from
structure member name.

Signed-off-by: Pavel Emelyanov <[email protected]>
Signed-off-by: Alexey Dobriyan <[email protected]>
---

include/linux/genhd.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -13,7 +13,7 @@

#ifdef CONFIG_BLOCK

-#define kobj_to_dev(kobj) container_of(kobj, struct device, kobj)
+#define kobj_to_dev(k) container_of(k, struct device, kobj)
#define dev_to_disk(device) container_of(device, struct gendisk, dev)
#define dev_to_part(device) container_of(device, struct hd_struct, dev)

2008-01-12 01:33:20

by Greg KH

Subject: Re: [PATCH -mm 1/4] genhd: fixup kobj_to_dev() macro

On Tue, Jan 08, 2008 at 11:43:04AM +0300, Alexey Dobriyan wrote:
> Please, fold into gregkh-driver-block-device.patch
> -------------------------------------------------------
> [PATCH -mm 1/4] genhd: fixup kobj_to_dev() macro

Thanks, I've now merged it in.

greg k-h