From: David Ahern Now that netns_get_fd handles by name and pid, the special handling in devlink to fallback to PID can be removed with both cases handled by the FD attribute. Signed-off-by: David Ahern --- devlink/devlink.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/devlink/devlink.c b/devlink/devlink.c index 730515a78950..908a0e32be2b 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -428,12 +428,6 @@ static void dl_arg_inc(struct dl *dl) dl->argv++; } -static void dl_arg_dec(struct dl *dl) -{ - dl->argc++; - dl->argv--; -} - static char *dl_argv_next(struct dl *dl) { char *ret; @@ -2153,14 +2147,12 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_required, err = dl_argv_str(dl, &netns_str); if (err) return err; - opts->netns = netns_get_fd(netns_str); - if ((int)opts->netns < 0) { - dl_arg_dec(dl); - err = dl_argv_uint32_t(dl, &opts->netns); - if (err) - return err; - opts->netns_is_pid = true; - } + + err = netns_get_fd(netns_str); + if (err < 0) + return err; + + opts->netns = err; o_found |= DL_OPT_NETNS; } else if (dl_argv_match(dl, "action") && (o_all & DL_OPT_RELOAD_ACTION)) { @@ -2725,10 +2717,7 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl) mnl_attr_put_u8(nlh, DEVLINK_ATTR_TRAP_ACTION, opts->trap_action); if (opts->present & DL_OPT_NETNS) - mnl_attr_put_u32(nlh, - opts->netns_is_pid ? DEVLINK_ATTR_NETNS_PID : - DEVLINK_ATTR_NETNS_FD, - opts->netns); + mnl_attr_put_u32(nlh, DEVLINK_ATTR_NETNS_FD, opts->netns); if (opts->present & DL_OPT_RELOAD_ACTION) mnl_attr_put_u8(nlh, DEVLINK_ATTR_RELOAD_ACTION, opts->reload_action); -- 2.43.0