summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-12-16 21:30:07 (GMT)
committerDavid S. Miller <davem@davemloft.net>2008-01-28 22:58:09 (GMT)
commitea40b324d791d86a42b858d073007de4d133227e (patch)
tree0fa2465408c90f18afafecef1ed9565f77ef3496
parent8afd351c772d1815347d5c46716b099fde00a579 (diff)
downloadlinux-ea40b324d791d86a42b858d073007de4d133227e.tar.xz
[IPV4]: Make __devinet_sysctl_register return an error
Currently, this function is void, so failures in creating sysctls for new/renamed devices are not reported to anywhere. Fixing this is another complex (needed?) task, but this return value is needed during the namespaces creation to handle the case, when we failed to create "all" and "default" entries. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/devinet.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 2dc2f7e..82def2c 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1454,8 +1454,8 @@ static struct devinet_sysctl_table {
},
};
-static void __devinet_sysctl_register(char *dev_name, int ctl_name,
- struct ipv4_devconf *p)
+static int __devinet_sysctl_register(struct net *net, char *dev_name,
+ int ctl_name, struct ipv4_devconf *p)
{
int i;
struct devinet_sysctl_table *t;
@@ -1497,14 +1497,14 @@ static void __devinet_sysctl_register(char *dev_name, int ctl_name,
goto free_procname;
p->sysctl = t;
- return;
+ return 0;
free_procname:
kfree(t->dev_name);
free:
kfree(t);
out:
- return;
+ return -ENOBUFS;
}
static void __devinet_sysctl_unregister(struct ipv4_devconf *cnf)