diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2018-01-15 16:42:40 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-01-16 15:01:33 -0500 |
commit | 96890d62523c2cddc2c053ad29de35c4d935cf11 (patch) | |
tree | c849442ebd9ae2f90531c8d127ec027790f5675d /net/rose | |
parent | 868717ae73c5ad297b91fb52db1396f2336609a8 (diff) |
net: delete /proc THIS_MODULE references
/proc has been ignoring struct file_operations::owner field for 10 years.
Specifically, it started with commit 786d7e1612f0b0adb6046f19b906609e4fe8b1ba
("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: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rose')
-rw-r--r-- | net/rose/af_rose.c | 1 | ||||
-rw-r--r-- | net/rose/rose_route.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 6a5c4992cf61..083bd251406f 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c | |||
@@ -1461,7 +1461,6 @@ static int rose_info_open(struct inode *inode, struct file *file) | |||
1461 | } | 1461 | } |
1462 | 1462 | ||
1463 | static const struct file_operations rose_info_fops = { | 1463 | static const struct file_operations rose_info_fops = { |
1464 | .owner = THIS_MODULE, | ||
1465 | .open = rose_info_open, | 1464 | .open = rose_info_open, |
1466 | .read = seq_read, | 1465 | .read = seq_read, |
1467 | .llseek = seq_lseek, | 1466 | .llseek = seq_lseek, |
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c index 8ca3124df83f..178619ddab68 100644 --- a/net/rose/rose_route.c +++ b/net/rose/rose_route.c | |||
@@ -1156,7 +1156,6 @@ static int rose_nodes_open(struct inode *inode, struct file *file) | |||
1156 | } | 1156 | } |
1157 | 1157 | ||
1158 | const struct file_operations rose_nodes_fops = { | 1158 | const struct file_operations rose_nodes_fops = { |
1159 | .owner = THIS_MODULE, | ||
1160 | .open = rose_nodes_open, | 1159 | .open = rose_nodes_open, |
1161 | .read = seq_read, | 1160 | .read = seq_read, |
1162 | .llseek = seq_lseek, | 1161 | .llseek = seq_lseek, |
@@ -1240,7 +1239,6 @@ static int rose_neigh_open(struct inode *inode, struct file *file) | |||
1240 | } | 1239 | } |
1241 | 1240 | ||
1242 | const struct file_operations rose_neigh_fops = { | 1241 | const struct file_operations rose_neigh_fops = { |
1243 | .owner = THIS_MODULE, | ||
1244 | .open = rose_neigh_open, | 1242 | .open = rose_neigh_open, |
1245 | .read = seq_read, | 1243 | .read = seq_read, |
1246 | .llseek = seq_lseek, | 1244 | .llseek = seq_lseek, |
@@ -1326,7 +1324,6 @@ static int rose_route_open(struct inode *inode, struct file *file) | |||
1326 | } | 1324 | } |
1327 | 1325 | ||
1328 | const struct file_operations rose_routes_fops = { | 1326 | const struct file_operations rose_routes_fops = { |
1329 | .owner = THIS_MODULE, | ||
1330 | .open = rose_route_open, | 1327 | .open = rose_route_open, |
1331 | .read = seq_read, | 1328 | .read = seq_read, |
1332 | .llseek = seq_lseek, | 1329 | .llseek = seq_lseek, |