[PATCH] kernel.h: handle pointers to arrays better in container_of()

[Ian Abbott]

If the first parameter of container_of() is a pointer to a
non-const-qualified array type, the local variable __mptr will be
defined with a const-qualified array type.  In ISO C, these types are
incompatible.  They work as expected in GNU C, but some versions will
issue warnings.  For example, GCC 4.9 produces the warning
"initialization from incompatible pointer type".  Fix it by avoiding
defining the __mptr variable.  This also avoids other GCC extensions.

The container_of_safe() macro has the same problem.  Here, we cannot
avoid all GCC extensions without eliminating possible side-effects, but
we can avoid having pointers to differently qualified array types.

Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Michal Nazarewicz <mina86@xxxxxxxxxx>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@xxxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxx>
Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Cc: Johannes Berg <johannes.berg@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Alexander Potapenko <glider@xxxxxxxxxx>
---
 include/linux/kernel.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index c64f998..5117b9f 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -832,9 +832,8 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
  * @member:	the name of the member within the struct.
  *
  */
-#define container_of(ptr, type, member) ({			\
-	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
-	(type *)( (char *)__mptr - offsetof(type,member) );})
+#define container_of(ptr, type, member) \
+	((type *)((char *)(ptr) - offsetof(type, member)))
 
 /**
  * container_of_safe - safe version of container_of
@@ -846,9 +845,9 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
  * @type, return 0.
  */
 #define container_of_safe(ptr, type, member) ({			\
-	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
-        (size_t)__mptr >= offsetof(type,member) ?		\
-	(type *)( (char *)__mptr - offsetof(type,member) ) : (type *)0 ;})
+	char *__mptr = (char *)(ptr);				\
+	(size_t)__mptr >= offsetof(type, member) ?		\
+	(type *)(__mptr - offsetof(type, member)) : (type *)0; })
 
 
 /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */
-- 
2.9.3