diff options
author | Johannes Berg <johannes.berg@intel.com> | 2017-04-12 08:34:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-04-13 13:58:22 -0400 |
commit | fe52145f91fe81b994e4622f6b9c3a0f22643363 (patch) | |
tree | 035cf3626e36e74c27846e297c09596273dd0c9e /net/tipc/node.c | |
parent | fceb6435e85298f747fee938415057af837f5a8a (diff) |
netlink: pass extended ACK struct where available
This is an add-on to the previous patch that passes the extended ACK
structure where it's already available by existing genl_info or extack
function arguments.
This was done with this spatch (with some manual adjustment of
indentation):
@@
expression A, B, C, D, E;
identifier fn, info;
@@
fn(..., struct genl_info *info, ...) {
...
-nlmsg_parse(A, B, C, D, E, NULL)
+nlmsg_parse(A, B, C, D, E, info->extack)
...
}
@@
expression A, B, C, D, E;
identifier fn, info;
@@
fn(..., struct genl_info *info, ...) {
<...
-nla_parse_nested(A, B, C, D, NULL)
+nla_parse_nested(A, B, C, D, info->extack)
...>
}
@@
expression A, B, C, D, E;
identifier fn, extack;
@@
fn(..., struct netlink_ext_ack *extack, ...) {
<...
-nlmsg_parse(A, B, C, D, E, NULL)
+nlmsg_parse(A, B, C, D, E, extack)
...>
}
@@
expression A, B, C, D, E;
identifier fn, extack;
@@
fn(..., struct netlink_ext_ack *extack, ...) {
<...
-nla_parse(A, B, C, D, E, NULL)
+nla_parse(A, B, C, D, E, extack)
...>
}
@@
expression A, B, C, D, E;
identifier fn, extack;
@@
fn(..., struct netlink_ext_ack *extack, ...) {
...
-nlmsg_parse(A, B, C, D, E, NULL)
+nlmsg_parse(A, B, C, D, E, extack)
...
}
@@
expression A, B, C, D;
identifier fn, extack;
@@
fn(..., struct netlink_ext_ack *extack, ...) {
<...
-nla_parse_nested(A, B, C, D, NULL)
+nla_parse_nested(A, B, C, D, extack)
...>
}
@@
expression A, B, C, D;
identifier fn, extack;
@@
fn(..., struct netlink_ext_ack *extack, ...) {
<...
-nlmsg_validate(A, B, C, D, NULL)
+nlmsg_validate(A, B, C, D, extack)
...>
}
@@
expression A, B, C, D;
identifier fn, extack;
@@
fn(..., struct netlink_ext_ack *extack, ...) {
<...
-nla_validate(A, B, C, D, NULL)
+nla_validate(A, B, C, D, extack)
...>
}
@@
expression A, B, C;
identifier fn, extack;
@@
fn(..., struct netlink_ext_ack *extack, ...) {
<...
-nla_validate_nested(A, B, C, NULL)
+nla_validate_nested(A, B, C, extack)
...>
}
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/node.c')
-rw-r--r-- | net/tipc/node.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 1dcde24c7053..01b1f077603e 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -1608,7 +1608,7 @@ int tipc_nl_peer_rm(struct sk_buff *skb, struct genl_info *info) | |||
1608 | 1608 | ||
1609 | err = nla_parse_nested(attrs, TIPC_NLA_NET_MAX, | 1609 | err = nla_parse_nested(attrs, TIPC_NLA_NET_MAX, |
1610 | info->attrs[TIPC_NLA_NET], tipc_nl_net_policy, | 1610 | info->attrs[TIPC_NLA_NET], tipc_nl_net_policy, |
1611 | NULL); | 1611 | info->extack); |
1612 | if (err) | 1612 | if (err) |
1613 | return err; | 1613 | return err; |
1614 | 1614 | ||
@@ -1774,7 +1774,7 @@ int tipc_nl_node_set_link(struct sk_buff *skb, struct genl_info *info) | |||
1774 | 1774 | ||
1775 | err = nla_parse_nested(attrs, TIPC_NLA_LINK_MAX, | 1775 | err = nla_parse_nested(attrs, TIPC_NLA_LINK_MAX, |
1776 | info->attrs[TIPC_NLA_LINK], | 1776 | info->attrs[TIPC_NLA_LINK], |
1777 | tipc_nl_link_policy, NULL); | 1777 | tipc_nl_link_policy, info->extack); |
1778 | if (err) | 1778 | if (err) |
1779 | return err; | 1779 | return err; |
1780 | 1780 | ||
@@ -1902,7 +1902,7 @@ int tipc_nl_node_reset_link_stats(struct sk_buff *skb, struct genl_info *info) | |||
1902 | 1902 | ||
1903 | err = nla_parse_nested(attrs, TIPC_NLA_LINK_MAX, | 1903 | err = nla_parse_nested(attrs, TIPC_NLA_LINK_MAX, |
1904 | info->attrs[TIPC_NLA_LINK], | 1904 | info->attrs[TIPC_NLA_LINK], |
1905 | tipc_nl_link_policy, NULL); | 1905 | tipc_nl_link_policy, info->extack); |
1906 | if (err) | 1906 | if (err) |
1907 | return err; | 1907 | return err; |
1908 | 1908 | ||
@@ -2042,7 +2042,7 @@ int tipc_nl_node_set_monitor(struct sk_buff *skb, struct genl_info *info) | |||
2042 | 2042 | ||
2043 | err = nla_parse_nested(attrs, TIPC_NLA_MON_MAX, | 2043 | err = nla_parse_nested(attrs, TIPC_NLA_MON_MAX, |
2044 | info->attrs[TIPC_NLA_MON], | 2044 | info->attrs[TIPC_NLA_MON], |
2045 | tipc_nl_monitor_policy, NULL); | 2045 | tipc_nl_monitor_policy, info->extack); |
2046 | if (err) | 2046 | if (err) |
2047 | return err; | 2047 | return err; |
2048 | 2048 | ||