Skip to content

Commit c3a4fd5

Browse files
Jiri Pirkokuba-moo
Jiri Pirko
authored and
kuba-moo
committed
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: Jiri Pirko <jiri@nvidia.com> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Reviewed-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent dd25cfa commit c3a4fd5

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

‎net/devlink/devl_internal.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs);
128128
void devlink_notify_unregister(struct devlink *devlink);
129129
void devlink_notify_register(struct devlink *devlink);
130130

131-
int devlink_nl_instance_iter_dump(struct sk_buff *msg,
132-
struct netlink_callback *cb);
131+
int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
132+
struct netlink_callback *cb);
133133

134134
static inline struct devlink_nl_dump_state *
135135
devlink_dump_state(struct netlink_callback *cb)

‎net/devlink/leftover.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8898,14 +8898,14 @@ const struct genl_small_ops devlink_nl_ops[56] = {
88988898
.cmd = DEVLINK_CMD_GET,
88998899
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
89008900
.doit = devlink_nl_cmd_get_doit,
8901-
.dumpit = devlink_nl_instance_iter_dump,
8901+
.dumpit = devlink_nl_instance_iter_dumpit,
89028902
/* can be retrieved by unprivileged users */
89038903
},
89048904
{
89058905
.cmd = DEVLINK_CMD_PORT_GET,
89068906
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
89078907
.doit = devlink_nl_cmd_port_get_doit,
8908-
.dumpit = devlink_nl_instance_iter_dump,
8908+
.dumpit = devlink_nl_instance_iter_dumpit,
89098909
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
89108910
/* can be retrieved by unprivileged users */
89118911
},
@@ -8919,7 +8919,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
89198919
{
89208920
.cmd = DEVLINK_CMD_RATE_GET,
89218921
.doit = devlink_nl_cmd_rate_get_doit,
8922-
.dumpit = devlink_nl_instance_iter_dump,
8922+
.dumpit = devlink_nl_instance_iter_dumpit,
89238923
.internal_flags = DEVLINK_NL_FLAG_NEED_RATE,
89248924
/* can be retrieved by unprivileged users */
89258925
},
@@ -8967,7 +8967,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
89678967
{
89688968
.cmd = DEVLINK_CMD_LINECARD_GET,
89698969
.doit = devlink_nl_cmd_linecard_get_doit,
8970-
.dumpit = devlink_nl_instance_iter_dump,
8970+
.dumpit = devlink_nl_instance_iter_dumpit,
89718971
.internal_flags = DEVLINK_NL_FLAG_NEED_LINECARD,
89728972
/* can be retrieved by unprivileged users */
89738973
},
@@ -8981,14 +8981,14 @@ const struct genl_small_ops devlink_nl_ops[56] = {
89818981
.cmd = DEVLINK_CMD_SB_GET,
89828982
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
89838983
.doit = devlink_nl_cmd_sb_get_doit,
8984-
.dumpit = devlink_nl_instance_iter_dump,
8984+
.dumpit = devlink_nl_instance_iter_dumpit,
89858985
/* can be retrieved by unprivileged users */
89868986
},
89878987
{
89888988
.cmd = DEVLINK_CMD_SB_POOL_GET,
89898989
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
89908990
.doit = devlink_nl_cmd_sb_pool_get_doit,
8991-
.dumpit = devlink_nl_instance_iter_dump,
8991+
.dumpit = devlink_nl_instance_iter_dumpit,
89928992
/* can be retrieved by unprivileged users */
89938993
},
89948994
{
@@ -9001,7 +9001,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
90019001
.cmd = DEVLINK_CMD_SB_PORT_POOL_GET,
90029002
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
90039003
.doit = devlink_nl_cmd_sb_port_pool_get_doit,
9004-
.dumpit = devlink_nl_instance_iter_dump,
9004+
.dumpit = devlink_nl_instance_iter_dumpit,
90059005
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
90069006
/* can be retrieved by unprivileged users */
90079007
},
@@ -9016,7 +9016,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
90169016
.cmd = DEVLINK_CMD_SB_TC_POOL_BIND_GET,
90179017
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
90189018
.doit = devlink_nl_cmd_sb_tc_pool_bind_get_doit,
9019-
.dumpit = devlink_nl_instance_iter_dump,
9019+
.dumpit = devlink_nl_instance_iter_dumpit,
90209020
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
90219021
/* can be retrieved by unprivileged users */
90229022
},
@@ -9097,7 +9097,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
90979097
.cmd = DEVLINK_CMD_PARAM_GET,
90989098
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
90999099
.doit = devlink_nl_cmd_param_get_doit,
9100-
.dumpit = devlink_nl_instance_iter_dump,
9100+
.dumpit = devlink_nl_instance_iter_dumpit,
91019101
/* can be retrieved by unprivileged users */
91029102
},
91039103
{
@@ -9125,7 +9125,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
91259125
.cmd = DEVLINK_CMD_REGION_GET,
91269126
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
91279127
.doit = devlink_nl_cmd_region_get_doit,
9128-
.dumpit = devlink_nl_instance_iter_dump,
9128+
.dumpit = devlink_nl_instance_iter_dumpit,
91299129
.flags = GENL_ADMIN_PERM,
91309130
},
91319131
{
@@ -9151,14 +9151,14 @@ const struct genl_small_ops devlink_nl_ops[56] = {
91519151
.cmd = DEVLINK_CMD_INFO_GET,
91529152
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
91539153
.doit = devlink_nl_cmd_info_get_doit,
9154-
.dumpit = devlink_nl_instance_iter_dump,
9154+
.dumpit = devlink_nl_instance_iter_dumpit,
91559155
/* can be retrieved by unprivileged users */
91569156
},
91579157
{
91589158
.cmd = DEVLINK_CMD_HEALTH_REPORTER_GET,
91599159
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
91609160
.doit = devlink_nl_cmd_health_reporter_get_doit,
9161-
.dumpit = devlink_nl_instance_iter_dump,
9161+
.dumpit = devlink_nl_instance_iter_dumpit,
91629162
.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
91639163
/* can be retrieved by unprivileged users */
91649164
},
@@ -9213,7 +9213,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
92139213
{
92149214
.cmd = DEVLINK_CMD_TRAP_GET,
92159215
.doit = devlink_nl_cmd_trap_get_doit,
9216-
.dumpit = devlink_nl_instance_iter_dump,
9216+
.dumpit = devlink_nl_instance_iter_dumpit,
92179217
/* can be retrieved by unprivileged users */
92189218
},
92199219
{
@@ -9224,7 +9224,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
92249224
{
92259225
.cmd = DEVLINK_CMD_TRAP_GROUP_GET,
92269226
.doit = devlink_nl_cmd_trap_group_get_doit,
9227-
.dumpit = devlink_nl_instance_iter_dump,
9227+
.dumpit = devlink_nl_instance_iter_dumpit,
92289228
/* can be retrieved by unprivileged users */
92299229
},
92309230
{
@@ -9235,7 +9235,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
92359235
{
92369236
.cmd = DEVLINK_CMD_TRAP_POLICER_GET,
92379237
.doit = devlink_nl_cmd_trap_policer_get_doit,
9238-
.dumpit = devlink_nl_instance_iter_dump,
9238+
.dumpit = devlink_nl_instance_iter_dumpit,
92399239
/* can be retrieved by unprivileged users */
92409240
},
92419241
{
@@ -9246,7 +9246,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
92469246
{
92479247
.cmd = DEVLINK_CMD_SELFTESTS_GET,
92489248
.doit = devlink_nl_cmd_selftests_get_doit,
9249-
.dumpit = devlink_nl_instance_iter_dump,
9249+
.dumpit = devlink_nl_instance_iter_dumpit,
92509250
/* can be retrieved by unprivileged users */
92519251
},
92529252
{

‎net/devlink/netlink.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ static const struct devlink_gen_cmd *devl_gen_cmds[] = {
196196
[DEVLINK_CMD_SELFTESTS_GET] = &devl_gen_selftests,
197197
};
198198

199-
int devlink_nl_instance_iter_dump(struct sk_buff *msg,
200-
struct netlink_callback *cb)
199+
int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
200+
struct netlink_callback *cb)
201201
{
202202
const struct genl_dumpit_info *info = genl_dumpit_info(cb);
203203
struct devlink_nl_dump_state *state = devlink_dump_state(cb);

0 commit comments

Comments
 (0)