summaryrefslogtreecommitdiffstats
path: root/net/atm
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2018-01-15 16:42:40 -0500
committerDavid S. Miller <davem@davemloft.net>2018-01-16 15:01:33 -0500
commit96890d62523c2cddc2c053ad29de35c4d935cf11 (patch)
treec849442ebd9ae2f90531c8d127ec027790f5675d /net/atm
parent868717ae73c5ad297b91fb52db1396f2336609a8 (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/atm')
-rw-r--r--net/atm/br2684.c1
-rw-r--r--net/atm/lec.c1
-rw-r--r--net/atm/mpoa_proc.c1
-rw-r--r--net/atm/proc.c1
4 files changed, 0 insertions, 4 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 4e111196f902..fd94bea36ee8 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -824,7 +824,6 @@ static int br2684_proc_open(struct inode *inode, struct file *file)
824} 824}
825 825
826static const struct file_operations br2684_proc_ops = { 826static const struct file_operations br2684_proc_ops = {
827 .owner = THIS_MODULE,
828 .open = br2684_proc_open, 827 .open = br2684_proc_open,
829 .read = seq_read, 828 .read = seq_read,
830 .llseek = seq_lseek, 829 .llseek = seq_lseek,
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 6676e3433261..09a1f056712a 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -992,7 +992,6 @@ static int lec_seq_open(struct inode *inode, struct file *file)
992} 992}
993 993
994static const struct file_operations lec_seq_fops = { 994static const struct file_operations lec_seq_fops = {
995 .owner = THIS_MODULE,
996 .open = lec_seq_open, 995 .open = lec_seq_open,
997 .read = seq_read, 996 .read = seq_read,
998 .llseek = seq_lseek, 997 .llseek = seq_lseek,
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c
index 2212da9c2da2..b93cc0f18292 100644
--- a/net/atm/mpoa_proc.c
+++ b/net/atm/mpoa_proc.c
@@ -57,7 +57,6 @@ static int parse_qos(const char *buff);
57 * Define allowed FILE OPERATIONS 57 * Define allowed FILE OPERATIONS
58 */ 58 */
59static const struct file_operations mpc_file_operations = { 59static const struct file_operations mpc_file_operations = {
60 .owner = THIS_MODULE,
61 .open = proc_mpc_open, 60 .open = proc_mpc_open,
62 .read = seq_read, 61 .read = seq_read,
63 .llseek = seq_lseek, 62 .llseek = seq_lseek,
diff --git a/net/atm/proc.c b/net/atm/proc.c
index 642f9272ab95..edc48edc95c1 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -37,7 +37,6 @@ static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,
37 size_t count, loff_t *pos); 37 size_t count, loff_t *pos);
38 38
39static const struct file_operations proc_atm_dev_ops = { 39static const struct file_operations proc_atm_dev_ops = {
40 .owner = THIS_MODULE,
41 .read = proc_dev_atm_read, 40 .read = proc_dev_atm_read,
42 .llseek = noop_llseek, 41 .llseek = noop_llseek,
43}; 42};