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

[TCP]: Remove owner from tcp_seq_afinfo.

Browse Source 
Move it to tcp_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-04-13 22:13:53 -07:00
committed by David S. Miller
parent 68fcadd16c
commit 5f4472c5a6
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/tcp.h
View File

@@ -1325,7 +1325,6 @@ enum tcp_seq_states {
}; };
struct tcp_seq_afinfo { struct tcp_seq_afinfo {
struct module *owner;
char *name; char *name;
sa_family_t family; sa_family_t family;
struct file_operations seq_fops; struct file_operations seq_fops;

5
net/ipv4/tcp_ipv4.c
View File

@@ -2232,7 +2232,6 @@ int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo)
int rc = 0; int rc = 0;
struct proc_dir_entry *p; struct proc_dir_entry *p;
afinfo->seq_fops.owner = afinfo->owner;
afinfo->seq_fops.open = tcp_seq_open; afinfo->seq_fops.open = tcp_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;
@@ -2382,9 +2381,11 @@ out:
} }
static struct tcp_seq_afinfo tcp4_seq_afinfo = { static struct tcp_seq_afinfo tcp4_seq_afinfo = {
.owner = THIS_MODULE,
.name = "tcp", .name = "tcp",
.family = AF_INET, .family = AF_INET,
.seq_fops = {
.owner = THIS_MODULE,
},
.seq_ops = { .seq_ops = {
.show = tcp4_seq_show, .show = tcp4_seq_show,
}, },

4
net/ipv6/tcp_ipv6.c
View File

@@ -2121,9 +2121,11 @@ out:
} }
static struct tcp_seq_afinfo tcp6_seq_afinfo = { static struct tcp_seq_afinfo tcp6_seq_afinfo = {
.owner = THIS_MODULE,
.name = "tcp6", .name = "tcp6",
.family = AF_INET6, .family = AF_INET6,
.seq_fops = {
.owner = THIS_MODULE,
},
.seq_ops = { .seq_ops = {
.show = tcp6_seq_show, .show = tcp6_seq_show,
}, },