cgroup: fix sock_cgroup_data initialization on earlier compilers
Subsystems (3)
Tejun Heo
maintainerPATCH 1/1 cgroup: fix sock_cgroup_data initialization on earlier compilers
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.
--- include/linux/cgroup-defs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/cgroup-defs.h +2 -2
@@ -616,7 +616,7 @@ static inline u32 sock_cgroup_classid(ststatic 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_prioistatic 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 ;
From: Tejun Heo <[email protected]>
Date: Wed, 9 Dec 2015 12:30:46 -0500
Quoted 14 lines
sock_cgroup_datais a struct containing an anonymous union.sock_cgroup_set_prioidx()andsock_cgroup_set_classid()were initializing a field inside the anonymous union as follows.struct
sock_ccgroup_dataskcd_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 initializerinclude/linux/cgroup-defs.h:619: warning: missing braces around initializerinclude/linux/cgroup-defs.h:619: warning: (near initialization for ‘skcd_buf.<anonymous>’)
Quoted 7 lines
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 <[email protected]>Reported-by Alaa Hleihel <[email protected]>Fixes bd1060a1d671 ("sock, cgroup: add sock->sk_cgroup")
Applied, thanks.