X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=net%2F8021q%2Fvlanproc.c;fp=net%2F8021q%2Fvlanproc.c;h=971e6233801eab307ef56506e9a18038465d424b;hb=69ab4b7d6db68396dbfa827daa8d6f30f9b546a8;hp=5da02e29a2c6201f471901021651c0fc8f0b0f3c;hpb=198a291ce3a9103f4738600e3cf5416b66e009d9;p=safe%2Fjmp%2Flinux-2.6 diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index 5da02e2..971e623 100644 --- a/net/8021q/vlanproc.c +++ b/net/8021q/vlanproc.c @@ -158,15 +158,18 @@ void vlan_proc_cleanup(void) int __init vlan_proc_init(void) { proc_vlan_dir = proc_mkdir(name_root, init_net.proc_net); - if (proc_vlan_dir) { - proc_vlan_conf = create_proc_entry(name_conf, - S_IFREG|S_IRUSR|S_IWUSR, - proc_vlan_dir); - if (proc_vlan_conf) { - proc_vlan_conf->proc_fops = &vlan_fops; - return 0; - } - } + if (!proc_vlan_dir) + goto err; + + proc_vlan_conf = create_proc_entry(name_conf, S_IFREG|S_IRUSR|S_IWUSR, + proc_vlan_dir); + if (!proc_vlan_conf) + goto err; + proc_vlan_conf->proc_fops = &vlan_fops; + return 0; + +err: + pr_err("%s: can't create entry in proc filesystem!\n", __FUNCTION__); vlan_proc_cleanup(); return -ENOBUFS; }