diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-03-29 02:25:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-29 02:25:53 +0100 |
| commit | 4ad96d39a2d74c1b2e400b602da2594f5098fc26 (patch) | |
| tree | 570666522e544892feba440728a59f336e13c3dd | |
| parent | [UDP]: Place file operations directly into udp_seq_afinfo. (diff) | |
| download | linux-4ad96d39a2d74c1b2e400b602da2594f5098fc26.tar.xz linux-4ad96d39a2d74c1b2e400b602da2594f5098fc26.zip | |
[UDP]: Remove owner from udp_seq_afinfo.
Move it to udp_seq_afinfo->seq_fops as should be.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/udp.h | 1 | ||||
| -rw-r--r-- | net/ipv4/udp.c | 5 | ||||
| -rw-r--r-- | net/ipv4/udplite.c | 4 | ||||
| -rw-r--r-- | net/ipv6/udp.c | 4 | ||||
| -rw-r--r-- | net/ipv6/udplite.c | 4 |
5 files changed, 12 insertions, 6 deletions
diff --git a/include/net/udp.h b/include/net/udp.h index 5cf0e593dda7..24a41fa31641 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -185,7 +185,6 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6); /* /proc */ struct udp_seq_afinfo { - struct module *owner; char *name; sa_family_t family; struct hlist_head *hashtable; diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index a95dff8063a4..9143645f9a1b 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1596,7 +1596,6 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo) struct proc_dir_entry *p; int rc = 0; - afinfo->seq_fops.owner = afinfo->owner; afinfo->seq_fops.open = udp_seq_open; afinfo->seq_fops.read = seq_read; afinfo->seq_fops.llseek = seq_lseek; @@ -1656,10 +1655,12 @@ int udp4_seq_show(struct seq_file *seq, void *v) /* ------------------------------------------------------------------------ */ static struct udp_seq_afinfo udp4_seq_afinfo = { - .owner = THIS_MODULE, .name = "udp", .family = AF_INET, .hashtable = udp_hash, + .seq_fops = { + .owner = THIS_MODULE, + }, .seq_ops = { .show = udp4_seq_show, }, diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c index 148ae72af111..72ce26b6c4d3 100644 --- a/net/ipv4/udplite.c +++ b/net/ipv4/udplite.c @@ -72,10 +72,12 @@ static struct inet_protosw udplite4_protosw = { #ifdef CONFIG_PROC_FS static struct udp_seq_afinfo udplite4_seq_afinfo = { - .owner = THIS_MODULE, .name = "udplite", .family = AF_INET, .hashtable = udplite_hash, + .seq_fops = { + .owner = THIS_MODULE, + }, .seq_ops = { .show = udp4_seq_show, }, diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index ff8d53ecdd60..30ef7dc5d403 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -978,10 +978,12 @@ int udp6_seq_show(struct seq_file *seq, void *v) } static struct udp_seq_afinfo udp6_seq_afinfo = { - .owner = THIS_MODULE, .name = "udp6", .family = AF_INET6, .hashtable = udp_hash, + .seq_fops = { + .owner = THIS_MODULE, + }, .seq_ops = { .show = udp6_seq_show, }, diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c index 5adf651d0721..491efd00a866 100644 --- a/net/ipv6/udplite.c +++ b/net/ipv6/udplite.c @@ -97,10 +97,12 @@ void udplitev6_exit(void) #ifdef CONFIG_PROC_FS static struct udp_seq_afinfo udplite6_seq_afinfo = { - .owner = THIS_MODULE, .name = "udplite6", .family = AF_INET6, .hashtable = udplite_hash, + .seq_fops = { + .owner = THIS_MODULE, + }, .seq_ops = { .show = udp6_seq_show, }, |