| Message ID | 1529400197-24165-1-git-send-email-lirongqing@baidu.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: propagate dev_get_valid_name return code | expand |
From: Li RongQing <lirongqing@baidu.com> Date: Tue, 19 Jun 2018 17:23:17 +0800 > if dev_get_valid_name failed, propagate its return code > > and remove the setting err to ENODEV, it will be set to > 0 again before dev_change_net_namespace exits. > > Signed-off-by: Li RongQing <lirongqing@baidu.com> Applied, thank you.
diff --git a/net/core/dev.c b/net/core/dev.c index 1844d9bc5714..1c7a3761ec3c 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -8661,7 +8661,8 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char /* We get here if we can't use the current device name */ if (!pat) goto out; - if (dev_get_valid_name(net, dev, pat) < 0) + err = dev_get_valid_name(net, dev, pat); + if (err < 0) goto out; } @@ -8673,7 +8674,6 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char dev_close(dev); /* And unlink it from device chain */ - err = -ENODEV; unlist_netdevice(dev); synchronize_net();
if dev_get_valid_name failed, propagate its return code and remove the setting err to ENODEV, it will be set to 0 again before dev_change_net_namespace exits. Signed-off-by: Li RongQing <lirongqing@baidu.com> --- net/core/dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)