Commit 4ad96d39 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[UDP]: Remove owner from udp_seq_afinfo. 



Move it to udp_seq_afinfo->seq_fops as should be.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ba9441b

include/net/udp.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

net/ipv4/udp.c

+3 −2
Original line number Diff line number Diff line
@@ -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,

	},

net/ipv4/udplite.c

+3 −1
Original line number Diff line number Diff line
@@ -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,

	},

net/ipv6/udp.c

+3 −1
Original line number Diff line number Diff line
@@ -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,

	},

net/ipv6/udplite.c

+3 −1
Original line number Diff line number Diff line
@@ -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,

	},