lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[UDP]: Remove owner from udp_seq_afinfo.

Browse Source 
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>
This commit is contained in:
Denis V. Lunev
2008-03-28 18:25:53 -07:00
committed by David S. Miller
parent 3ba9441bdf
commit 4ad96d39a2
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/udp.h
View File

@@ -185,7 +185,6 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
/* /proc */ /* /proc */
struct udp_seq_afinfo { struct udp_seq_afinfo {
struct module *owner;
char *name; char *name;
sa_family_t family; sa_family_t family;
struct hlist_head *hashtable; struct hlist_head *hashtable;

5
net/ipv4/udp.c
View File

@@ -1596,7 +1596,6 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
struct proc_dir_entry *p; struct proc_dir_entry *p;
int rc = 0; int rc = 0;
afinfo->seq_fops.owner = afinfo->owner;
afinfo->seq_fops.open = udp_seq_open; afinfo->seq_fops.open = udp_seq_open;
afinfo->seq_fops.read = seq_read; afinfo->seq_fops.read = seq_read;
afinfo->seq_fops.llseek = seq_lseek; 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 = { static struct udp_seq_afinfo udp4_seq_afinfo = {
.owner = THIS_MODULE,
.name = "udp", .name = "udp",
.family = AF_INET, .family = AF_INET,
.hashtable = udp_hash, .hashtable = udp_hash,
.seq_fops = {
.owner = THIS_MODULE,
},
.seq_ops = { .seq_ops = {
.show = udp4_seq_show, .show = udp4_seq_show,
}, },

4
net/ipv4/udplite.c
View File

@@ -72,10 +72,12 @@ static struct inet_protosw udplite4_protosw = {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static struct udp_seq_afinfo udplite4_seq_afinfo = { static struct udp_seq_afinfo udplite4_seq_afinfo = {
.owner = THIS_MODULE,
.name = "udplite", .name = "udplite",
.family = AF_INET, .family = AF_INET,
.hashtable = udplite_hash, .hashtable = udplite_hash,
.seq_fops = {
.owner = THIS_MODULE,
},
.seq_ops = { .seq_ops = {
.show = udp4_seq_show, .show = udp4_seq_show,
}, },

4
net/ipv6/udp.c
View File

@@ -978,10 +978,12 @@ int udp6_seq_show(struct seq_file *seq, void *v)
} }
static struct udp_seq_afinfo udp6_seq_afinfo = { static struct udp_seq_afinfo udp6_seq_afinfo = {
.owner = THIS_MODULE,
.name = "udp6", .name = "udp6",
.family = AF_INET6, .family = AF_INET6,
.hashtable = udp_hash, .hashtable = udp_hash,
.seq_fops = {
.owner = THIS_MODULE,
},
.seq_ops = { .seq_ops = {
.show = udp6_seq_show, .show = udp6_seq_show,
}, },

4
net/ipv6/udplite.c
View File

@@ -97,10 +97,12 @@ void udplitev6_exit(void)
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static struct udp_seq_afinfo udplite6_seq_afinfo = { static struct udp_seq_afinfo udplite6_seq_afinfo = {
.owner = THIS_MODULE,
.name = "udplite6", .name = "udplite6",
.family = AF_INET6, .family = AF_INET6,
.hashtable = udplite_hash, .hashtable = udplite_hash,
.seq_fops = {
.owner = THIS_MODULE,
},
.seq_ops = { .seq_ops = {
.show = udp6_seq_show, .show = udp6_seq_show,
}, },