diff options
| -rw-r--r-- | include/net/ip.h | 1 | ||||
| -rw-r--r-- | net/ipv4/arp.c | 2 | ||||
| -rw-r--r-- | net/ipv4/fib_hash.c | 2 | ||||
| -rw-r--r-- | net/ipv4/proc.c | 8 | ||||
| -rw-r--r-- | net/ipv4/route.c | 2 | ||||
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 | ||||
| -rw-r--r-- | net/ipv4/udp.c | 2 |
7 files changed, 5 insertions, 14 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index a3ecef15c09d..f6a4e017f7bf 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -295,7 +295,6 @@ extern void ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err, extern void ip_local_error(struct sock *sk, int err, u32 daddr, u16 dport, u32 info); -extern int ip_seq_release(struct inode *inode, struct file *file); extern int ipv4_proc_init(void); /* sysctl helpers - any sysctl which holds a value that ends up being diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index b1368d019c2b..3dddae90bbdc 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -1389,7 +1389,7 @@ static struct file_operations arp_seq_fops = { .open = arp_seq_open, .read = seq_read, .llseek = seq_lseek, - .release = ip_seq_release, + .release = seq_release_private, }; static int __init arp_proc_init(void) diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c index 5002cd1fb9da..d6ceba8beb16 100644 --- a/net/ipv4/fib_hash.c +++ b/net/ipv4/fib_hash.c @@ -1069,7 +1069,7 @@ static struct file_operations fib_seq_fops = { .open = fib_seq_open, .read = seq_read, .llseek = seq_lseek, - .release = ip_seq_release, + .release = seq_release_private, }; int __init fib_proc_init(void) diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c index dc93723cf692..6cdf043bb87e 100644 --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c @@ -265,11 +265,3 @@ out_netstat: goto out; } -int ip_seq_release(struct inode *inode, struct file *file) -{ - struct seq_file *seq = (struct seq_file *)file->private_data; - - kfree(seq->private); - seq->private = NULL; - return seq_release(inode, file); -} diff --git a/net/ipv4/route.c b/net/ipv4/route.c index d2989aaacf1b..db069664483c 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -386,7 +386,7 @@ static struct file_operations rt_cache_seq_fops = { .open = rt_cache_seq_open, .read = seq_read, .llseek = seq_lseek, - .release = ip_seq_release, + .release = seq_release_private, }; int __init rt_cache_proc_init(void) diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index b51c68d40b43..2ad587593075 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2568,7 +2568,7 @@ static struct file_operations tcp_seq_fops = { .open = tcp_seq_open, .read = seq_read, .llseek = seq_lseek, - .release = ip_seq_release, + .release = seq_release_private, }; int __init tcp_proc_init(void) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 530187fb2aa4..050441e25259 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1479,7 +1479,7 @@ static struct file_operations udp_seq_fops = { .open = udp_seq_open, .read = seq_read, .llseek = seq_lseek, - .release = ip_seq_release, + .release = seq_release_private, }; /* ------------------------------------------------------------------------ */ |