Skip to content

K
Kernel

openeuler / Kernel
大约 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 c3a4fd57 编写于 作者: J Jiri Pirko 提交者： Jakub Kicinski
浏览文件
操作

devlink: rename devlink_nl_instance_iter_dump() to "dumpit" 

To have the name of the function consistent with the struct cb name,
rename devlink_nl_instance_iter_dump() to
devlink_nl_instance_iter_dumpit().
Signed-off-by: NJiri Pirko <jiri@nvidia.com>
Reviewed-by: NJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: NLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: NJakub Kicinski <kuba@kernel.org>
上级 dd25cfab
隐藏空白更改
内联 并排
Showing with 20 addition and 20 deletion
net/devlink/devl_internal.h
浏览文件 @ c3a4fd57
...@@ -128,8 +128,8 @@ devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs); ...@@ -128,8 +128,8 @@ devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs);
void devlink_notify_unregister(struct devlink *devlink); void devlink_notify_unregister(struct devlink *devlink);
void devlink_notify_register(struct devlink *devlink); void devlink_notify_register(struct devlink *devlink);
int devlink_nl_instance_iter_dump(struct sk_buff *msg, int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
struct netlink_callback *cb); struct netlink_callback *cb);
static inline struct devlink_nl_dump_state * static inline struct devlink_nl_dump_state *
devlink_dump_state(struct netlink_callback *cb) devlink_dump_state(struct netlink_callback *cb)
......
net/devlink/leftover.c
浏览文件 @ c3a4fd57
...@@ -8898,14 +8898,14 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -8898,14 +8898,14 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_GET, .cmd = DEVLINK_CMD_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_get_doit, .doit = devlink_nl_cmd_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
{ {
.cmd = DEVLINK_CMD_PORT_GET, .cmd = DEVLINK_CMD_PORT_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_port_get_doit, .doit = devlink_nl_cmd_port_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT, .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
...@@ -8919,7 +8919,7 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -8919,7 +8919,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
{ {
.cmd = DEVLINK_CMD_RATE_GET, .cmd = DEVLINK_CMD_RATE_GET,
.doit = devlink_nl_cmd_rate_get_doit, .doit = devlink_nl_cmd_rate_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
.internal_flags = DEVLINK_NL_FLAG_NEED_RATE, .internal_flags = DEVLINK_NL_FLAG_NEED_RATE,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
...@@ -8967,7 +8967,7 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -8967,7 +8967,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
{ {
.cmd = DEVLINK_CMD_LINECARD_GET, .cmd = DEVLINK_CMD_LINECARD_GET,
.doit = devlink_nl_cmd_linecard_get_doit, .doit = devlink_nl_cmd_linecard_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
.internal_flags = DEVLINK_NL_FLAG_NEED_LINECARD, .internal_flags = DEVLINK_NL_FLAG_NEED_LINECARD,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
...@@ -8981,14 +8981,14 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -8981,14 +8981,14 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_SB_GET, .cmd = DEVLINK_CMD_SB_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_sb_get_doit, .doit = devlink_nl_cmd_sb_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
{ {
.cmd = DEVLINK_CMD_SB_POOL_GET, .cmd = DEVLINK_CMD_SB_POOL_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_sb_pool_get_doit, .doit = devlink_nl_cmd_sb_pool_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
{ {
...@@ -9001,7 +9001,7 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -9001,7 +9001,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_SB_PORT_POOL_GET, .cmd = DEVLINK_CMD_SB_PORT_POOL_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_sb_port_pool_get_doit, .doit = devlink_nl_cmd_sb_port_pool_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT, .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
...@@ -9016,7 +9016,7 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -9016,7 +9016,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_SB_TC_POOL_BIND_GET, .cmd = DEVLINK_CMD_SB_TC_POOL_BIND_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_sb_tc_pool_bind_get_doit, .doit = devlink_nl_cmd_sb_tc_pool_bind_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT, .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
...@@ -9097,7 +9097,7 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -9097,7 +9097,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_PARAM_GET, .cmd = DEVLINK_CMD_PARAM_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_param_get_doit, .doit = devlink_nl_cmd_param_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
{ {
...@@ -9125,7 +9125,7 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -9125,7 +9125,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_REGION_GET, .cmd = DEVLINK_CMD_REGION_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_region_get_doit, .doit = devlink_nl_cmd_region_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
.flags = GENL_ADMIN_PERM, .flags = GENL_ADMIN_PERM,
}, },
{ {
...@@ -9151,14 +9151,14 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -9151,14 +9151,14 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_INFO_GET, .cmd = DEVLINK_CMD_INFO_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_info_get_doit, .doit = devlink_nl_cmd_info_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
{ {
.cmd = DEVLINK_CMD_HEALTH_REPORTER_GET, .cmd = DEVLINK_CMD_HEALTH_REPORTER_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_health_reporter_get_doit, .doit = devlink_nl_cmd_health_reporter_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT, .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
...@@ -9213,7 +9213,7 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -9213,7 +9213,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
{ {
.cmd = DEVLINK_CMD_TRAP_GET, .cmd = DEVLINK_CMD_TRAP_GET,
.doit = devlink_nl_cmd_trap_get_doit, .doit = devlink_nl_cmd_trap_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
{ {
...@@ -9224,7 +9224,7 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -9224,7 +9224,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
{ {
.cmd = DEVLINK_CMD_TRAP_GROUP_GET, .cmd = DEVLINK_CMD_TRAP_GROUP_GET,
.doit = devlink_nl_cmd_trap_group_get_doit, .doit = devlink_nl_cmd_trap_group_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
{ {
...@@ -9235,7 +9235,7 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -9235,7 +9235,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
{ {
.cmd = DEVLINK_CMD_TRAP_POLICER_GET, .cmd = DEVLINK_CMD_TRAP_POLICER_GET,
.doit = devlink_nl_cmd_trap_policer_get_doit, .doit = devlink_nl_cmd_trap_policer_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
{ {
...@@ -9246,7 +9246,7 @@ const struct genl_small_ops devlink_nl_ops[56] = { ...@@ -9246,7 +9246,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
{ {
.cmd = DEVLINK_CMD_SELFTESTS_GET, .cmd = DEVLINK_CMD_SELFTESTS_GET,
.doit = devlink_nl_cmd_selftests_get_doit, .doit = devlink_nl_cmd_selftests_get_doit,
.dumpit = devlink_nl_instance_iter_dump, .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */ /* can be retrieved by unprivileged users */
}, },
{ {
......
net/devlink/netlink.c
浏览文件 @ c3a4fd57
...@@ -196,8 +196,8 @@ static const struct devlink_gen_cmd *devl_gen_cmds[] = { ...@@ -196,8 +196,8 @@ static const struct devlink_gen_cmd *devl_gen_cmds[] = {
[DEVLINK_CMD_SELFTESTS_GET] = &devl_gen_selftests, [DEVLINK_CMD_SELFTESTS_GET] = &devl_gen_selftests,
}; };
int devlink_nl_instance_iter_dump(struct sk_buff *msg, int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
struct netlink_callback *cb) struct netlink_callback *cb)
{ {
const struct genl_dumpit_info *info = genl_dumpit_info(cb); const struct genl_dumpit_info *info = genl_dumpit_info(cb);
struct devlink_nl_dump_state *state = devlink_dump_state(cb); struct devlink_nl_dump_state *state = devlink_dump_state(cb);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或