Skip to content

Commit

Permalink
[PATCH] mark struct file_operations const 8
Browse files Browse the repository at this point in the history
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: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
fenrus75 authored and Linus Torvalds committed Feb 12, 2007
1 parent 9a32144 commit da7071d
Show file tree
Hide file tree
Showing 31 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion net/irda/ircomm/ircomm_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static void ircomm_control_indication(struct ircomm_cb *self,
extern struct proc_dir_entry *proc_irda;
static int ircomm_seq_open(struct inode *, struct file *);

static struct file_operations ircomm_proc_fops = {
static const struct file_operations ircomm_proc_fops = {
.owner = THIS_MODULE,
.open = ircomm_seq_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/irda/iriap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1080,7 +1080,7 @@ static int irias_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &irias_seq_ops);
}

struct file_operations irias_seq_fops = {
const struct file_operations irias_seq_fops = {
.owner = THIS_MODULE,
.open = irias_seq_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/irda/irlan/irlan_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ extern struct proc_dir_entry *proc_irda;

static int irlan_seq_open(struct inode *inode, struct file *file);

static struct file_operations irlan_fops = {
static const struct file_operations irlan_fops = {
.owner = THIS_MODULE,
.open = irlan_seq_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/irda/irlap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1244,7 +1244,7 @@ static int irlap_seq_open(struct inode *inode, struct file *file)
goto out;
}

struct file_operations irlap_seq_fops = {
const struct file_operations irlap_seq_fops = {
.owner = THIS_MODULE,
.open = irlap_seq_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/irda/irlmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -2026,7 +2026,7 @@ static int irlmp_seq_open(struct inode *inode, struct file *file)
goto out;
}

struct file_operations irlmp_seq_fops = {
const struct file_operations irlmp_seq_fops = {
.owner = THIS_MODULE,
.open = irlmp_seq_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/irda/irttp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1895,7 +1895,7 @@ static int irttp_seq_open(struct inode *inode, struct file *file)
goto out;
}

struct file_operations irttp_seq_fops = {
const struct file_operations irttp_seq_fops = {
.owner = THIS_MODULE,
.open = irttp_seq_open,
.read = seq_read,
Expand Down
4 changes: 2 additions & 2 deletions net/llc/llc_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,15 @@ static int llc_seq_core_open(struct inode *inode, struct file *file)
return seq_open(file, &llc_seq_core_ops);
}

static struct file_operations llc_seq_socket_fops = {
static const struct file_operations llc_seq_socket_fops = {
.owner = THIS_MODULE,
.open = llc_seq_socket_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};

static struct file_operations llc_seq_core_fops = {
static const struct file_operations llc_seq_core_fops = {
.owner = THIS_MODULE,
.open = llc_seq_core_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nf_conntrack_expect.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ static int exp_open(struct inode *inode, struct file *file)
return seq_open(file, &exp_seq_ops);
}

struct file_operations exp_file_ops = {
const struct file_operations exp_file_ops = {
.owner = THIS_MODULE,
.open = exp_open,
.read = seq_read,
Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/nf_conntrack_standalone.c
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ static int ct_open(struct inode *inode, struct file *file)
return ret;
}

static struct file_operations ct_file_ops = {
static const struct file_operations ct_file_ops = {
.owner = THIS_MODULE,
.open = ct_open,
.read = seq_read,
Expand Down Expand Up @@ -317,7 +317,7 @@ static int ct_cpu_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &ct_cpu_seq_ops);
}

static struct file_operations ct_cpu_seq_fops = {
static const struct file_operations ct_cpu_seq_fops = {
.owner = THIS_MODULE,
.open = ct_cpu_seq_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nf_log.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ static int nflog_open(struct inode *inode, struct file *file)
return seq_open(file, &nflog_seq_ops);
}

static struct file_operations nflog_file_ops = {
static const struct file_operations nflog_file_ops = {
.owner = THIS_MODULE,
.open = nflog_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nf_queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ static int nfqueue_open(struct inode *inode, struct file *file)
return seq_open(file, &nfqueue_seq_ops);
}

static struct file_operations nfqueue_file_ops = {
static const struct file_operations nfqueue_file_ops = {
.owner = THIS_MODULE,
.open = nfqueue_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nfnetlink_log.c
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ static int nful_open(struct inode *inode, struct file *file)
return ret;
}

static struct file_operations nful_file_ops = {
static const struct file_operations nful_file_ops = {
.owner = THIS_MODULE,
.open = nful_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nfnetlink_queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@ static int nfqnl_open(struct inode *inode, struct file *file)
return ret;
}

static struct file_operations nfqnl_file_ops = {
static const struct file_operations nfqnl_file_ops = {
.owner = THIS_MODULE,
.open = nfqnl_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/x_tables.c
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ static int xt_tgt_open(struct inode *inode, struct file *file)
return ret;
}

static struct file_operations xt_file_ops = {
static const struct file_operations xt_file_ops = {
.owner = THIS_MODULE,
.open = xt_tgt_open,
.read = seq_read,
Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/xt_hashlimit.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ MODULE_ALIAS("ip6t_hashlimit");
/* need to declare this at the top */
static struct proc_dir_entry *hashlimit_procdir4;
static struct proc_dir_entry *hashlimit_procdir6;
static struct file_operations dl_file_ops;
static const struct file_operations dl_file_ops;

/* hash table crap */
struct dsthash_dst {
Expand Down Expand Up @@ -714,7 +714,7 @@ static int dl_proc_open(struct inode *inode, struct file *file)
return ret;
}

static struct file_operations dl_file_ops = {
static const struct file_operations dl_file_ops = {
.owner = THIS_MODULE,
.open = dl_proc_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/netlink/af_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,7 @@ static int netlink_seq_open(struct inode *inode, struct file *file)
return 0;
}

static struct file_operations netlink_seq_fops = {
static const struct file_operations netlink_seq_fops = {
.owner = THIS_MODULE,
.open = netlink_seq_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/netrom/af_netrom.c
Original file line number Diff line number Diff line change
Expand Up @@ -1335,7 +1335,7 @@ static int nr_info_open(struct inode *inode, struct file *file)
return seq_open(file, &nr_info_seqops);
}

static struct file_operations nr_info_fops = {
static const struct file_operations nr_info_fops = {
.owner = THIS_MODULE,
.open = nr_info_open,
.read = seq_read,
Expand Down
4 changes: 2 additions & 2 deletions net/netrom/nr_route.c
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ static int nr_node_info_open(struct inode *inode, struct file *file)
return seq_open(file, &nr_node_seqops);
}

struct file_operations nr_nodes_fops = {
const struct file_operations nr_nodes_fops = {
.owner = THIS_MODULE,
.open = nr_node_info_open,
.read = seq_read,
Expand Down Expand Up @@ -1018,7 +1018,7 @@ static int nr_neigh_info_open(struct inode *inode, struct file *file)
return seq_open(file, &nr_neigh_seqops);
}

struct file_operations nr_neigh_fops = {
const struct file_operations nr_neigh_fops = {
.owner = THIS_MODULE,
.open = nr_neigh_info_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/packet/af_packet.c
Original file line number Diff line number Diff line change
Expand Up @@ -1952,7 +1952,7 @@ static int packet_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &packet_seq_ops);
}

static struct file_operations packet_seq_fops = {
static const struct file_operations packet_seq_fops = {
.owner = THIS_MODULE,
.open = packet_seq_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/rose/af_rose.c
Original file line number Diff line number Diff line change
Expand Up @@ -1440,7 +1440,7 @@ static int rose_info_open(struct inode *inode, struct file *file)
return seq_open(file, &rose_info_seqops);
}

static struct file_operations rose_info_fops = {
static const struct file_operations rose_info_fops = {
.owner = THIS_MODULE,
.open = rose_info_open,
.read = seq_read,
Expand Down
6 changes: 3 additions & 3 deletions net/rose/rose_route.c
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@ static int rose_nodes_open(struct inode *inode, struct file *file)
return seq_open(file, &rose_node_seqops);
}

struct file_operations rose_nodes_fops = {
const struct file_operations rose_nodes_fops = {
.owner = THIS_MODULE,
.open = rose_nodes_open,
.read = seq_read,
Expand Down Expand Up @@ -1211,7 +1211,7 @@ static int rose_neigh_open(struct inode *inode, struct file *file)
return seq_open(file, &rose_neigh_seqops);
}

struct file_operations rose_neigh_fops = {
const struct file_operations rose_neigh_fops = {
.owner = THIS_MODULE,
.open = rose_neigh_open,
.read = seq_read,
Expand Down Expand Up @@ -1295,7 +1295,7 @@ static int rose_route_open(struct inode *inode, struct file *file)
return seq_open(file, &rose_route_seqops);
}

struct file_operations rose_routes_fops = {
const struct file_operations rose_routes_fops = {
.owner = THIS_MODULE,
.open = rose_route_open,
.read = seq_read,
Expand Down
8 changes: 4 additions & 4 deletions net/rxrpc/proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static struct seq_operations rxrpc_proc_transports_ops = {
.show = rxrpc_proc_transports_show,
};

static struct file_operations rxrpc_proc_transports_fops = {
static const struct file_operations rxrpc_proc_transports_fops = {
.open = rxrpc_proc_transports_open,
.read = seq_read,
.llseek = seq_lseek,
Expand All @@ -57,7 +57,7 @@ static struct seq_operations rxrpc_proc_peers_ops = {
.show = rxrpc_proc_peers_show,
};

static struct file_operations rxrpc_proc_peers_fops = {
static const struct file_operations rxrpc_proc_peers_fops = {
.open = rxrpc_proc_peers_open,
.read = seq_read,
.llseek = seq_lseek,
Expand All @@ -77,7 +77,7 @@ static struct seq_operations rxrpc_proc_conns_ops = {
.show = rxrpc_proc_conns_show,
};

static struct file_operations rxrpc_proc_conns_fops = {
static const struct file_operations rxrpc_proc_conns_fops = {
.open = rxrpc_proc_conns_open,
.read = seq_read,
.llseek = seq_lseek,
Expand All @@ -97,7 +97,7 @@ static struct seq_operations rxrpc_proc_calls_ops = {
.show = rxrpc_proc_calls_show,
};

static struct file_operations rxrpc_proc_calls_fops = {
static const struct file_operations rxrpc_proc_calls_fops = {
.open = rxrpc_proc_calls_open,
.read = seq_read,
.llseek = seq_lseek,
Expand Down
2 changes: 1 addition & 1 deletion net/sched/sch_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ static int psched_open(struct inode *inode, struct file *file)
return single_open(file, psched_show, PDE(inode)->data);
}

static struct file_operations psched_fops = {
static const struct file_operations psched_fops = {
.owner = THIS_MODULE,
.open = psched_open,
.read = seq_read,
Expand Down
6 changes: 3 additions & 3 deletions net/sctp/proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static int sctp_snmp_seq_open(struct inode *inode, struct file *file)
return single_open(file, sctp_snmp_seq_show, NULL);
}

static struct file_operations sctp_snmp_seq_fops = {
static const struct file_operations sctp_snmp_seq_fops = {
.owner = THIS_MODULE,
.open = sctp_snmp_seq_open,
.read = seq_read,
Expand Down Expand Up @@ -264,7 +264,7 @@ static int sctp_eps_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &sctp_eps_ops);
}

static struct file_operations sctp_eps_seq_fops = {
static const struct file_operations sctp_eps_seq_fops = {
.open = sctp_eps_seq_open,
.read = seq_read,
.llseek = seq_lseek,
Expand Down Expand Up @@ -374,7 +374,7 @@ static int sctp_assocs_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &sctp_assoc_ops);
}

static struct file_operations sctp_assocs_seq_fops = {
static const struct file_operations sctp_assocs_seq_fops = {
.open = sctp_assocs_seq_open,
.read = seq_read,
.llseek = seq_lseek,
Expand Down
2 changes: 1 addition & 1 deletion net/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
* in the operation structures but are done directly via the socketcall() multiplexor.
*/

static struct file_operations socket_file_ops = {
static const struct file_operations socket_file_ops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.aio_read = sock_aio_read,
Expand Down
12 changes: 6 additions & 6 deletions net/sunrpc/cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,9 @@ static DEFINE_SPINLOCK(cache_list_lock);
static struct cache_detail *current_detail;
static int current_index;

static struct file_operations cache_file_operations;
static struct file_operations content_file_operations;
static struct file_operations cache_flush_operations;
static const struct file_operations cache_file_operations;
static const struct file_operations content_file_operations;
static const struct file_operations cache_flush_operations;

static void do_cache_clean(struct work_struct *work);
static DECLARE_DELAYED_WORK(cache_cleaner, do_cache_clean);
Expand Down Expand Up @@ -887,7 +887,7 @@ cache_release(struct inode *inode, struct file *filp)



static struct file_operations cache_file_operations = {
static const struct file_operations cache_file_operations = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = cache_read,
Expand Down Expand Up @@ -1245,7 +1245,7 @@ static int content_release(struct inode *inode, struct file *file)
return seq_release(inode, file);
}

static struct file_operations content_file_operations = {
static const struct file_operations content_file_operations = {
.open = content_open,
.read = seq_read,
.llseek = seq_lseek,
Expand Down Expand Up @@ -1297,7 +1297,7 @@ static ssize_t write_flush(struct file * file, const char __user * buf,
return count;
}

static struct file_operations cache_flush_operations = {
static const struct file_operations cache_flush_operations = {
.open = nonseekable_open,
.read = read_flush,
.write = write_flush,
Expand Down
4 changes: 2 additions & 2 deletions net/sunrpc/rpc_pipe.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ rpc_pipe_ioctl(struct inode *ino, struct file *filp,
}
}

static struct file_operations rpc_pipe_fops = {
static const struct file_operations rpc_pipe_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = rpc_pipe_read,
Expand Down Expand Up @@ -366,7 +366,7 @@ rpc_info_release(struct inode *inode, struct file *file)
return single_release(inode, file);
}

static struct file_operations rpc_info_operations = {
static const struct file_operations rpc_info_operations = {
.owner = THIS_MODULE,
.open = rpc_info_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/sunrpc/stats.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static int rpc_proc_open(struct inode *inode, struct file *file)
return single_open(file, rpc_proc_show, PDE(inode)->data);
}

static struct file_operations rpc_proc_fops = {
static const struct file_operations rpc_proc_fops = {
.owner = THIS_MODULE,
.open = rpc_proc_open,
.read = seq_read,
Expand Down
2 changes: 1 addition & 1 deletion net/unix/af_unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -2040,7 +2040,7 @@ static int unix_seq_open(struct inode *inode, struct file *file)
goto out;
}

static struct file_operations unix_seq_fops = {
static const struct file_operations unix_seq_fops = {
.owner = THIS_MODULE,
.open = unix_seq_open,
.read = seq_read,
Expand Down
Loading

0 comments on commit da7071d

Please sign in to comment.