Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96890d62 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

net: delete /proc THIS_MODULE references 



/proc has been ignoring struct file_operations::owner field for 10 years.
Specifically, it started with commit 786d7e16
("Fix rmmod/read/write races in /proc entries"). Notice the chunk where
inode->i_fop is initialized with proxy struct file_operations for
regular files:

	-               if (de->proc_fops)
	-                       inode->i_fop = de->proc_fops;
	+               if (de->proc_fops) {
	+                       if (S_ISREG(inode->i_mode))
	+                               inode->i_fop = &proc_reg_file_ops;
	+                       else
	+                               inode->i_fop = de->proc_fops;
	+               }

VFS stopped pinning module at this point.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 868717ae

net/8021q/vlanproc.c

+0 −2
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ static int vlan_seq_open(struct inode *inode, struct file *file) 
}



static const struct file_operations vlan_fops = {

	.owner	 = THIS_MODULE,

	.open    = vlan_seq_open,

	.read    = seq_read,

	.llseek  = seq_lseek,
@@ -97,7 +96,6 @@ static int vlandev_seq_open(struct inode *inode, struct file *file) 
}



static const struct file_operations vlandev_fops = {

	.owner = THIS_MODULE,

	.open    = vlandev_seq_open,

	.read    = seq_read,

	.llseek  = seq_lseek,

net/appletalk/aarp.c

+0 −1
Original line number Diff line number Diff line
@@ -1047,7 +1047,6 @@ static int aarp_seq_open(struct inode *inode, struct file *file) 
}



const struct file_operations atalk_seq_arp_fops = {

	.owner		= THIS_MODULE,

	.open           = aarp_seq_open,

	.read           = seq_read,

	.llseek         = seq_lseek,

net/appletalk/atalk_proc.c

+0 −3
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ static int atalk_seq_socket_open(struct inode *inode, struct file *file) 
}



static const struct file_operations atalk_seq_interface_fops = {

	.owner		= THIS_MODULE,

	.open		= atalk_seq_interface_open,

	.read		= seq_read,

	.llseek		= seq_lseek,
@@ -234,7 +233,6 @@ static const struct file_operations atalk_seq_interface_fops = { 
};



static const struct file_operations atalk_seq_route_fops = {

	.owner		= THIS_MODULE,

	.open		= atalk_seq_route_open,

	.read		= seq_read,

	.llseek		= seq_lseek,
@@ -242,7 +240,6 @@ static const struct file_operations atalk_seq_route_fops = { 
};



static const struct file_operations atalk_seq_socket_fops = {

	.owner		= THIS_MODULE,

	.open		= atalk_seq_socket_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

net/atm/br2684.c

+0 −1
Original line number Diff line number Diff line
@@ -824,7 +824,6 @@ static int br2684_proc_open(struct inode *inode, struct file *file) 
}



static const struct file_operations br2684_proc_ops = {

	.owner = THIS_MODULE,

	.open = br2684_proc_open,

	.read = seq_read,

	.llseek = seq_lseek,

net/atm/lec.c

+0 −1
Original line number Diff line number Diff line
@@ -992,7 +992,6 @@ static int lec_seq_open(struct inode *inode, struct file *file) 
}



static const struct file_operations lec_seq_fops = {

	.owner = THIS_MODULE,

	.open = lec_seq_open,

	.read = seq_read,

	.llseek = seq_lseek,