Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1287681 > unrolled thread
| Started by | Tejun Heo <tj@kernel.org> |
|---|---|
| First post | 2015-12-09 18:40 +0100 |
| Last post | 2015-12-09 21:10 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH net-next] cgroup: fix sock_cgroup_data initialization on earlier compilers Tejun Heo <tj@kernel.org> - 2015-12-09 18:40 +0100
Re: [PATCH net-next] cgroup: fix sock_cgroup_data initialization on earlier compilers David Miller <davem@davemloft.net> - 2015-12-09 21:10 +0100
| From | Tejun Heo <tj@kernel.org> |
|---|---|
| Date | 2015-12-09 18:40 +0100 |
| Subject | [PATCH net-next] cgroup: fix sock_cgroup_data initialization on earlier compilers |
| Message-ID | <qDQSB-2X5-1@gated-at.bofh.it> |
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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2015-12-09 21:10 +0100 |
| Subject | Re: [PATCH net-next] cgroup: fix sock_cgroup_data initialization on earlier compilers |
| Message-ID | <qDTdN-4yA-35@gated-at.bofh.it> |
| In reply to | #1287681 |
RnJvbTogVGVqdW4gSGVvIDx0akBrZXJuZWwub3JnPg0KRGF0ZTogV2VkLCA5IERlYyAyMDE1IDEy OjMwOjQ2IC0wNTAwDQoNCj4gc29ja19jZ3JvdXBfZGF0YSBpcyBhIHN0cnVjdCBjb250YWluaW5n IGFuIGFub255bW91cyB1bmlvbi4NCj4gc29ja19jZ3JvdXBfc2V0X3ByaW9pZHgoKSBhbmQgc29j a19jZ3JvdXBfc2V0X2NsYXNzaWQoKSB3ZXJlDQo+IGluaXRpYWxpemluZyBhIGZpZWxkIGluc2lk ZSB0aGUgYW5vbnltb3VzIHVuaW9uIGFzIGZvbGxvd3MuDQo+IA0KPiAgc3RydWN0IHNvY2tfY2Nn cm91cF9kYXRhIHNrY2RfYnVmID0geyAudmFsID0gVkFMIH07DQo+IA0KPiBXaGlsZSB0aGlzIGlz IGZpbmUgb24gbW9yZSByZWNlbnQgY29tcGlsZXJzLCBnY2MtNC40LjcgdHJpZ2dlcnMgdGhlDQo+ IGZvbGxvd2luZyBlcnJvcnMuDQo+IA0KPiAgaW5jbHVkZS9saW51eC9jZ3JvdXAtZGVmcy5oOiBJ biBmdW5jdGlvbiChc29ja19jZ3JvdXBfc2V0X3ByaW9pZHiiOg0KPiAgaW5jbHVkZS9saW51eC9j Z3JvdXAtZGVmcy5oOjYxOTogZXJyb3I6IHVua25vd24gZmllbGQgoXZhbKIgc3BlY2lmaWVkIGlu IGluaXRpYWxpemVyDQo+ICBpbmNsdWRlL2xpbnV4L2Nncm91cC1kZWZzLmg6NjE5OiB3YXJuaW5n OiBtaXNzaW5nIGJyYWNlcyBhcm91bmQgaW5pdGlhbGl6ZXINCj4gIGluY2x1ZGUvbGludXgvY2dy b3VwLWRlZnMuaDo2MTk6IHdhcm5pbmc6IChuZWFyIGluaXRpYWxpemF0aW9uIGZvciChc2tjZF9i dWYuPGFub255bW91cz6iKQ0KPiANCj4gVGhpcyBpcyBiZWNhdXNlIC52YWwgYmVsb25ncyB0byB0 aGUgYW5vbnltb3VzIHVuaW9uIG5lc3RlZCBpbnNpZGUgdGhlDQo+IHN0cnVjdCBidXQgdGhlIGlu aXRpYWxpemVyIGlzIG1pc3NpbmcgdGhlIG5lc3RpbmcuICBGaXggaXQgYnkgYWRkaW5nDQo+IGFu IGV4dHJhIHBhaXIgb2YgYnJhY2VzLg0KPiANCj4gU2lnbmVkLW9mZi1ieTogVGVqdW4gSGVvIDx0 akBrZXJuZWwub3JnPg0KPiBSZXBvcnRlZC1ieTogQWxhYSBIbGVpaGVsIDxhbGFhQGRldi5tZWxs YW5veC5jby5pbD4NCj4gRml4ZXM6IGJkMTA2MGExZDY3MSAoInNvY2ssIGNncm91cDogYWRkIHNv Y2stPnNrX2Nncm91cCIpDQoNCkFwcGxpZWQsIHRoYW5rcy4NCg== -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web