Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / net / x25 / x25_proc.c

diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
index 78b05342606ef07fff0d80d5a24c68ca2c6ed225..1afa44d25beb8825e41ac5d263e826352b19a03e 100644 (file)
--- a/net/x25/x25_proc.c
+++ b/net/x25/x25_proc.c
@@ -293,7 +293,7 @@ static const struct file_operations x25_seq_route_fops = {
        .release        = seq_release,
 };
 
-static struct file_operations x25_seq_forward_fops = {
+static const struct file_operations x25_seq_forward_fops = {
        .owner          = THIS_MODULE,
        .open           = x25_seq_forward_open,
        .read           = seq_read,
@@ -312,20 +312,18 @@ int __init x25_proc_init(void)
        if (!x25_proc_dir)
                goto out;
 
-       p = create_proc_entry("route", S_IRUGO, x25_proc_dir);
+       p = proc_create("route", S_IRUGO, x25_proc_dir, &x25_seq_route_fops);
        if (!p)
                goto out_route;
-       p->proc_fops = &x25_seq_route_fops;
 
-       p = create_proc_entry("socket", S_IRUGO, x25_proc_dir);
+       p = proc_create("socket", S_IRUGO, x25_proc_dir, &x25_seq_socket_fops);
        if (!p)
                goto out_socket;
-       p->proc_fops = &x25_seq_socket_fops;
 
-       p = create_proc_entry("forward", S_IRUGO, x25_proc_dir);
+       p = proc_create("forward", S_IRUGO, x25_proc_dir,
+                       &x25_seq_forward_fops);
        if (!p)
                goto out_forward;
-       p->proc_fops = &x25_seq_forward_fops;
        rc = 0;
 
 out: