Skip to content

Commit

Permalink
cgroup: fix sock_cgroup_data initialization on earlier compilers
Browse files Browse the repository at this point in the history
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: bd1060a ("sock, cgroup: add sock->sk_cgroup")
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Tejun Heo authored and David S. Miller committed Dec 9, 2015
1 parent 264a4ac commit ad2c8c7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/linux/cgroup-defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ static inline u32 sock_cgroup_classid(struct sock_cgroup_data *skcd)
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;
Expand All @@ -633,7 +633,7 @@ static inline void sock_cgroup_set_prioidx(struct sock_cgroup_data *skcd,
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;
Expand Down

0 comments on commit ad2c8c7

Please sign in to comment.