* [PATCH net-next] cgroup: fix sock_cgroup_data initialization on earlier compilers
@ 2015-12-09 17:30 Tejun Heo
2015-12-09 20:02 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Tejun Heo @ 2015-12-09 17:30 UTC (permalink / raw)
To: David S. Miller; +Cc: Alaa Hleihel, netdev, linux-kernel
sock_cgroup_data is a struct containing an anonymous union.
sock_cgroup_set_prioidx() and sock_cgroup_set_classid() were
initializing a field inside the anonymous union as follows.
struct sock_ccgroup_data skcd_buf = { .val = VAL };
While this is fine on more recent compilers, gcc-4.4.7 triggers the
following errors.
include/linux/cgroup-defs.h: In function ‘sock_cgroup_set_prioidx’:
include/linux/cgroup-defs.h:619: error: unknown field ‘val’ specified in initializer
include/linux/cgroup-defs.h:619: warning: missing braces around initializer
include/linux/cgroup-defs.h:619: warning: (near initialization for ‘skcd_buf.<anonymous>’)
This is because .val belongs to the anonymous union nested inside the
struct but the initializer is missing the nesting. Fix it by adding
an extra pair of braces.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Alaa Hleihel <alaa@dev.mellanox.co.il>
Fixes: bd1060a1d671 ("sock, cgroup: add sock->sk_cgroup")
---
include/linux/cgroup-defs.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -616,7 +616,7 @@ static inline u32 sock_cgroup_classid(st
static inline void sock_cgroup_set_prioidx(struct sock_cgroup_data *skcd,
u16 prioidx)
{
- struct sock_cgroup_data skcd_buf = { .val = READ_ONCE(skcd->val) };
+ struct sock_cgroup_data skcd_buf = {{ .val = READ_ONCE(skcd->val) }};
if (sock_cgroup_prioidx(&skcd_buf) == prioidx)
return;
@@ -633,7 +633,7 @@ static inline void sock_cgroup_set_prioi
static inline void sock_cgroup_set_classid(struct sock_cgroup_data *skcd,
u32 classid)
{
- struct sock_cgroup_data skcd_buf = { .val = READ_ONCE(skcd->val) };
+ struct sock_cgroup_data skcd_buf = {{ .val = READ_ONCE(skcd->val) }};
if (sock_cgroup_classid(&skcd_buf) == classid)
return;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] cgroup: fix sock_cgroup_data initialization on earlier compilers
2015-12-09 17:30 [PATCH net-next] cgroup: fix sock_cgroup_data initialization on earlier compilers Tejun Heo
@ 2015-12-09 20:02 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2015-12-09 20:02 UTC (permalink / raw)
To: tj; +Cc: alaa, netdev, linux-kernel
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: Text/Plain; charset=iso-8859-7, Size: 1254 bytes --]
From: Tejun Heo <tj@kernel.org>
Date: Wed, 9 Dec 2015 12:30:46 -0500
> sock_cgroup_data is a struct containing an anonymous union.
> sock_cgroup_set_prioidx() and sock_cgroup_set_classid() were
> initializing a field inside the anonymous union as follows.
>
> struct sock_ccgroup_data skcd_buf = { .val = VAL };
>
> While this is fine on more recent compilers, gcc-4.4.7 triggers the
> following errors.
>
> include/linux/cgroup-defs.h: In function ¡sock_cgroup_set_prioidx¢:
> include/linux/cgroup-defs.h:619: error: unknown field ¡val¢ specified in initializer
> include/linux/cgroup-defs.h:619: warning: missing braces around initializer
> include/linux/cgroup-defs.h:619: warning: (near initialization for ¡skcd_buf.<anonymous>¢)
>
> This is because .val belongs to the anonymous union nested inside the
> struct but the initializer is missing the nesting. Fix it by adding
> an extra pair of braces.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Reported-by: Alaa Hleihel <alaa@dev.mellanox.co.il>
> Fixes: bd1060a1d671 ("sock, cgroup: add sock->sk_cgroup")
Applied, thanks.
ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þG«éÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á¶iOæ¬z·vØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?I¥
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] cgroup: fix sock_cgroup_data initialization on earlier compilers
@ 2015-12-09 20:02 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2015-12-09 20:02 UTC (permalink / raw)
To: tj; +Cc: alaa, netdev, linux-kernel
From: Tejun Heo <tj@kernel.org>
Date: Wed, 9 Dec 2015 12:30:46 -0500
> sock_cgroup_data is a struct containing an anonymous union.
> sock_cgroup_set_prioidx() and sock_cgroup_set_classid() were
> initializing a field inside the anonymous union as follows.
>
> struct sock_ccgroup_data skcd_buf = { .val = VAL };
>
> While this is fine on more recent compilers, gcc-4.4.7 triggers the
> following errors.
>
> include/linux/cgroup-defs.h: In function ‘sock_cgroup_set_prioidx’:
> include/linux/cgroup-defs.h:619: error: unknown field ‘val’ specified in initializer
> include/linux/cgroup-defs.h:619: warning: missing braces around initializer
> include/linux/cgroup-defs.h:619: warning: (near initialization for ‘skcd_buf.<anonymous>’)
>
> This is because .val belongs to the anonymous union nested inside the
> struct but the initializer is missing the nesting. Fix it by adding
> an extra pair of braces.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Reported-by: Alaa Hleihel <alaa@dev.mellanox.co.il>
> Fixes: bd1060a1d671 ("sock, cgroup: add sock->sk_cgroup")
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-12-09 20:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-09 17:30 [PATCH net-next] cgroup: fix sock_cgroup_data initialization on earlier compilers Tejun Heo
2015-12-09 20:02 ` David Miller
2015-12-09 20:02 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.