Commit 9a32144e authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds
Browse files

[PATCH] mark struct file_operations const 7



Many struct file_operations in the kernel can be "const".  Marking them const
moves these to the .rodata section, which avoids false sharing with potential
dirty data.  In addition it'll catch accidental writes at compile time to
these shared resources.
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 00977a59
......@@ -85,7 +85,7 @@ struct mqueue_inode_info {
};
static struct inode_operations mqueue_dir_inode_operations;
static struct file_operations mqueue_file_operations;
static const struct file_operations mqueue_file_operations;
static struct super_operations mqueue_super_ops;
static void remove_notification(struct mqueue_inode_info *info);
......@@ -1166,7 +1166,7 @@ static struct inode_operations mqueue_dir_inode_operations = {
.unlink = mqueue_unlink,
};
static struct file_operations mqueue_file_operations = {
static const struct file_operations mqueue_file_operations = {
.flush = mqueue_flush_file,
.poll = mqueue_poll_file,
.read = mqueue_read_file,
......
......@@ -42,7 +42,7 @@
#include "util.h"
static struct file_operations shm_file_operations;
static const struct file_operations shm_file_operations;
static struct vm_operations_struct shm_vm_ops;
static struct ipc_ids init_shm_ids;
......@@ -249,7 +249,7 @@ static int shm_release(struct inode *ino, struct file *file)
return 0;
}
static struct file_operations shm_file_operations = {
static const struct file_operations shm_file_operations = {
.mmap = shm_mmap,
.release = shm_release,
#ifndef CONFIG_MMU
......
......@@ -205,7 +205,7 @@ void __ipc_init ipc_init_ids(struct ipc_ids* ids, int size)
}
#ifdef CONFIG_PROC_FS
static struct file_operations sysvipc_proc_fops;
static const struct file_operations sysvipc_proc_fops;
/**
* ipc_init_proc_interface - Create a proc interface for sysipc types using a seq_file interface.
* @path: Path in procfs
......@@ -879,7 +879,7 @@ static int sysvipc_proc_release(struct inode *inode, struct file *file)
return seq_release_private(inode, file);
}
static struct file_operations sysvipc_proc_fops = {
static const struct file_operations sysvipc_proc_fops = {
.open = sysvipc_proc_open,
.read = seq_read,
.llseek = seq_lseek,
......
......@@ -2656,7 +2656,7 @@ static int cpuset_open(struct inode *inode, struct file *file)
return single_open(file, proc_cpuset_show, pid);
}
struct file_operations proc_cpuset_operations = {
const struct file_operations proc_cpuset_operations = {
.open = cpuset_open,
.read = seq_read,
.llseek = seq_lseek,
......
......@@ -576,7 +576,7 @@ static int rif_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &rif_seq_ops);
}
static struct file_operations rif_seq_fops = {
static const struct file_operations rif_seq_fops = {
.owner = THIS_MODULE,
.open = rif_seq_open,
.read = seq_read,
......
......@@ -81,7 +81,7 @@ static int vlan_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &vlan_seq_ops);
}
static struct file_operations vlan_fops = {
static const struct file_operations vlan_fops = {
.owner = THIS_MODULE,
.open = vlan_seq_open,
.read = seq_read,
......@@ -98,7 +98,7 @@ static int vlandev_seq_open(struct inode *inode, struct file *file)
return single_open(file, vlandev_seq_show, PDE(inode)->data);
}
static struct file_operations vlandev_fops = {
static const struct file_operations vlandev_fops = {
.owner = THIS_MODULE,
.open = vlandev_seq_open,
.read = seq_read,
......
......@@ -1048,7 +1048,7 @@ static int aarp_seq_open(struct inode *inode, struct file *file)
goto out;
}
struct file_operations atalk_seq_arp_fops = {
const struct file_operations atalk_seq_arp_fops = {
.owner = THIS_MODULE,
.open = aarp_seq_open,
.read = seq_read,
......
......@@ -240,7 +240,7 @@ static int atalk_seq_socket_open(struct inode *inode, struct file *file)
return seq_open(file, &atalk_seq_socket_ops);
}
static struct file_operations atalk_seq_interface_fops = {
static const struct file_operations atalk_seq_interface_fops = {
.owner = THIS_MODULE,
.open = atalk_seq_interface_open,
.read = seq_read,
......@@ -248,7 +248,7 @@ static struct file_operations atalk_seq_interface_fops = {
.release = seq_release,
};
static struct file_operations atalk_seq_route_fops = {
static const struct file_operations atalk_seq_route_fops = {
.owner = THIS_MODULE,
.open = atalk_seq_route_open,
.read = seq_read,
......@@ -256,7 +256,7 @@ static struct file_operations atalk_seq_route_fops = {
.release = seq_release,
};
static struct file_operations atalk_seq_socket_fops = {
static const struct file_operations atalk_seq_socket_fops = {
.owner = THIS_MODULE,
.open = atalk_seq_socket_open,
.read = seq_read,
......
......@@ -784,7 +784,7 @@ static int br2684_proc_open(struct inode *inode, struct file *file)
return seq_open(file, &br2684_seq_ops);
}
static struct file_operations br2684_proc_ops = {
static const struct file_operations br2684_proc_ops = {
.owner = THIS_MODULE,
.open = br2684_proc_open,
.read = seq_read,
......
......@@ -971,7 +971,7 @@ static int arp_seq_open(struct inode *inode, struct file *file)
goto out;
}
static struct file_operations arp_seq_fops = {
static const struct file_operations arp_seq_fops = {
.open = arp_seq_open,
.read = seq_read,
.llseek = seq_lseek,
......
......@@ -1212,7 +1212,7 @@ static int lec_seq_release(struct inode *inode, struct file *file)
return seq_release_private(inode, file);
}
static struct file_operations lec_seq_fops = {
static const struct file_operations lec_seq_fops = {
.owner = THIS_MODULE,
.open = lec_seq_open,
.read = seq_read,
......
......@@ -39,7 +39,7 @@ static int parse_qos(const char *buff);
/*
* Define allowed FILE OPERATIONS
*/
static struct file_operations mpc_file_operations = {
static const struct file_operations mpc_file_operations = {
.owner = THIS_MODULE,
.open = proc_mpc_open,
.read = seq_read,
......
......@@ -33,7 +33,7 @@
static ssize_t proc_dev_atm_read(struct file *file,char __user *buf,size_t count,
loff_t *pos);
static struct file_operations proc_atm_dev_ops = {
static const struct file_operations proc_atm_dev_ops = {
.owner = THIS_MODULE,
.read = proc_dev_atm_read,
};
......@@ -272,7 +272,7 @@ static int atm_dev_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &atm_dev_seq_ops);
}
static struct file_operations devices_seq_fops = {
static const struct file_operations devices_seq_fops = {
.open = atm_dev_seq_open,
.read = seq_read,
.llseek = seq_lseek,
......@@ -307,7 +307,7 @@ static int pvc_seq_open(struct inode *inode, struct file *file)
return __vcc_seq_open(inode, file, PF_ATMPVC, &pvc_seq_ops);
}
static struct file_operations pvc_seq_fops = {
static const struct file_operations pvc_seq_fops = {
.open = pvc_seq_open,
.read = seq_read,
.llseek = seq_lseek,
......@@ -341,7 +341,7 @@ static int vcc_seq_open(struct inode *inode, struct file *file)
return __vcc_seq_open(inode, file, 0, &vcc_seq_ops);
}
static struct file_operations vcc_seq_fops = {
static const struct file_operations vcc_seq_fops = {
.open = vcc_seq_open,
.read = seq_read,
.llseek = seq_lseek,
......@@ -376,7 +376,7 @@ static int svc_seq_open(struct inode *inode, struct file *file)
return __vcc_seq_open(inode, file, PF_ATMSVC, &svc_seq_ops);
}
static struct file_operations svc_seq_fops = {
static const struct file_operations svc_seq_fops = {
.open = svc_seq_open,
.read = seq_read,
.llseek = seq_lseek,
......@@ -457,7 +457,7 @@ void atm_proc_dev_deregister(struct atm_dev *dev)
static struct atm_proc_entry {
char *name;
struct file_operations *proc_fops;
const struct file_operations *proc_fops;
struct proc_dir_entry *dirent;
} atm_proc_ents[] = {
{ .name = "devices", .proc_fops = &devices_seq_fops },
......
......@@ -1938,7 +1938,7 @@ static int ax25_info_open(struct inode *inode, struct file *file)
return seq_open(file, &ax25_info_seqops);
}
static struct file_operations ax25_info_fops = {
static const struct file_operations ax25_info_fops = {
.owner = THIS_MODULE,
.open = ax25_info_open,
.read = seq_read,
......
......@@ -332,7 +332,7 @@ static int ax25_rt_info_open(struct inode *inode, struct file *file)
return seq_open(file, &ax25_rt_seqops);
}
struct file_operations ax25_route_fops = {
const struct file_operations ax25_route_fops = {
.owner = THIS_MODULE,
.open = ax25_rt_info_open,
.read = seq_read,
......
......@@ -198,7 +198,7 @@ static int ax25_uid_info_open(struct inode *inode, struct file *file)
return seq_open(file, &ax25_uid_seqops);
}
struct file_operations ax25_uid_fops = {
const struct file_operations ax25_uid_fops = {
.owner = THIS_MODULE,
.open = ax25_uid_info_open,
.read = seq_read,
......
......@@ -2200,7 +2200,7 @@ static int dev_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &dev_seq_ops);
}
static struct file_operations dev_seq_fops = {
static const struct file_operations dev_seq_fops = {
.owner = THIS_MODULE,
.open = dev_seq_open,
.read = seq_read,
......@@ -2220,7 +2220,7 @@ static int softnet_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &softnet_seq_ops);
}
static struct file_operations softnet_seq_fops = {
static const struct file_operations softnet_seq_fops = {
.owner = THIS_MODULE,
.open = softnet_seq_open,
.read = seq_read,
......
......@@ -277,7 +277,7 @@ static int dev_mc_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &dev_mc_seq_ops);
}
static struct file_operations dev_mc_seq_fops = {
static const struct file_operations dev_mc_seq_fops = {
.owner = THIS_MODULE,
.open = dev_mc_seq_open,
.read = seq_read,
......
......@@ -63,7 +63,7 @@ void neigh_changeaddr(struct neigh_table *tbl, struct net_device *dev);
static struct neigh_table *neigh_tables;
#ifdef CONFIG_PROC_FS
static struct file_operations neigh_stat_seq_fops;
static const struct file_operations neigh_stat_seq_fops;
#endif
/*
......@@ -2403,7 +2403,7 @@ static int neigh_stat_seq_open(struct inode *inode, struct file *file)
return ret;
};
static struct file_operations neigh_stat_seq_fops = {
static const struct file_operations neigh_stat_seq_fops = {
.owner = THIS_MODULE,
.open = neigh_stat_seq_open,
.read = seq_read,
......
......@@ -579,7 +579,7 @@ static int pgctrl_open(struct inode *inode, struct file *file)
return single_open(file, pgctrl_show, PDE(inode)->data);
}
static struct file_operations pktgen_fops = {
static const struct file_operations pktgen_fops = {
.owner = THIS_MODULE,
.open = pgctrl_open,
.read = seq_read,
......@@ -1672,7 +1672,7 @@ static int pktgen_if_open(struct inode *inode, struct file *file)
return single_open(file, pktgen_if_show, PDE(inode)->data);
}
static struct file_operations pktgen_if_fops = {
static const struct file_operations pktgen_if_fops = {
.owner = THIS_MODULE,
.open = pktgen_if_open,
.read = seq_read,
......@@ -1815,7 +1815,7 @@ static int pktgen_thread_open(struct inode *inode, struct file *file)
return single_open(file, pktgen_thread_show, PDE(inode)->data);
}
static struct file_operations pktgen_thread_fops = {
static const struct file_operations pktgen_thread_fops = {
.owner = THIS_MODULE,
.open = pktgen_thread_open,
.read = seq_read,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment