struct seq_operations and struct file_operations constification
Subsystems (12)
PATCH 1/1 struct seq_operations and struct file_operations constification
this trivial patch
- moves some file_operations structs into the .rodata section
- moves static strings from policy_types[] array into the .rodata section
- fixes generic seq_operations usages, so that those structs may be defined as "const" as well
tested on ia32
patch was already sent on 1006-10-08
Signed-off-by Helge Deller <[email protected]>
fs/seq_file.c | 4 ++-- include/linux/mmzone.h | 2 +- include/linux/relay.h | 2 +- include/linux/seq_file.h | 4 ++-- kernel/configs.c | 2 +- kernel/cpuset.c | 4 ++-- kernel/dma.c | 2 +- kernel/futex.c | 2 +- kernel/kallsyms.c | 4 ++-- kernel/lockdep_proc.c | 6 +++--- kernel/module.c | 2 +- kernel/power/user.c | 2 +- kernel/profile.c | 2 +- kernel/relay.c | 2 +- kernel/resource.c | 6 +++--- kernel/sched.c | 2 +- kernel/sysctl.c | 2 +- mm/mempolicy.c | 4 ++-- mm/page_alloc.c | 2 +- mm/shmem.c | 4 ++-- mm/slab.c | 4 ++-- mm/swapfile.c | 4 ++-- mm/vmstat.c | 8 ++++---- 23 files changed, 38 insertions(+), 38 deletions(-)
fs/seq_file.c +2 -2
@@ -26,7 +26,7 @@ #include <asm/page.h>* ERR_PTR(error). In the end of sequence they return %NULL. ->show() * returns 0 in case of success and negative number in case of error. */ -int seq_open (struct file *file,struct seq_operations *op) +int seq_open (struct file *file,const struct seq_operations *op) {struct seq_file *p = file->private_data;
@@ -408,7 +408,7 @@ EXPORT_SYMBOL(single_open);int single_release (struct inode *inode,struct file *file) { -struct seq_operations *op = ((struct seq_file *)file->private_data)->op; +const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;int res =seq_release (inode, file);kfree (op);return res;
include/linux/mmzone.h +1 -1
@@ -278,7 +278,7 @@ #endif/* * rarely used fields: */ -char *name; +const char *name; }____cacheline_internodealigned_in_smp ;/*
include/linux/relay.h +1 -1
@@ -274,7 +274,7 @@ static inline void subbuf_start_reserve(/* * exported relay file operations, kernel/relay.c */ -extern struct file_operations relay_file_operations; +extern const struct file_operations relay_file_operations;#endif /* _LINUX_RELAY_H */
include/linux/seq_file.h +2 -2
@@ -20,7 +20,7 @@ struct seq_file {loff_t index;loff_t version;struct mutex lock; -struct seq_operations *op; +const struct seq_operations *op;void *private; };
@@ -31,7 +31,7 @@ struct seq_operations {int (*show) (struct seq_file *m,void *v); }; -int seq_open (struct file *,struct seq_operations *); +int seq_open (struct file *,const struct seq_operations *);ssize_t seq_read (struct file *,char __user *,size_t ,loff_t *);loff_t seq_lseek (struct file *,loff_t ,int );int seq_release (struct inode *,struct file *);
kernel/configs.c +1 -1
@@ -75,7 +75,7 @@ ikconfig_read_current(struct file *file,return count; } -static struct file_operations ikconfig_file_ops = { +static const struct file_operations ikconfig_file_ops = { .owner =THIS_MODULE , .read = ikconfig_read_current, };
kernel/cpuset.c +2 -2
@@ -1532,7 +1532,7 @@ static int cpuset_rename(struct inode *oreturn simple_rename (old_dir, old_dentry, new_dir, new_dentry); } -static struct file_operations cpuset_file_operations = { +static const struct file_operations cpuset_file_operations = { .read = cpuset_file_read, .write = cpuset_file_write, .llseek = generic_file_llseek,
@@ -2610,7 +2610,7 @@ static int cpuset_open(struct inode *inoreturn 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,
kernel/dma.c +1 -1
@@ -140,7 +140,7 @@ static int proc_dma_open(struct inode *ireturn single_open (file, proc_dma_show,NULL ); } -static struct file_operations proc_dma_operations = { +static const struct file_operations proc_dma_operations = { .open = proc_dma_open, .read = seq_read, .llseek = seq_lseek,
kernel/futex.c +1 -1
@@ -1493,7 +1493,7 @@ static unsigned int futex_poll(struct fireturn ret; } -static struct file_operations futex_fops = { +static const struct file_operations futex_fops = { .release = futex_close, .poll = futex_poll, };
kernel/kallsyms.c +2 -2
@@ -401,7 +401,7 @@ static int s_show(struct seq_file *m, voreturn 0 ; } -static struct seq_operations kallsyms_op = { +static const struct seq_operations kallsyms_op = { .start = s_start, .next = s_next, .stop = s_stop,
@@ -436,7 +436,7 @@ static int kallsyms_release(struct inodereturn seq_release (inode, file); } -static struct file_operations kallsyms_operations = { +static const struct file_operations kallsyms_operations = { .open = kallsyms_open, .read = seq_read, .llseek = seq_lseek,
kernel/lockdep_proc.c +3 -3
@@ -113,7 +113,7 @@ #endifreturn 0 ; } -static struct seq_operations lockdep_ops = { +static const struct seq_operations lockdep_ops = { .start = l_start, .next = l_next, .stop = l_stop,
@@ -135,7 +135,7 @@ static int lockdep_open(struct inode *inreturn res; } -static struct file_operations proc_lockdep_operations = { +static const struct file_operations proc_lockdep_operations = { .open = lockdep_open, .read = seq_read, .llseek = seq_lseek,
@@ -319,7 +319,7 @@ static int lockdep_stats_open(struct inoreturn single_open (file, lockdep_stats_show,NULL ); } -static struct file_operations proc_lockdep_stats_operations = { +static const struct file_operations proc_lockdep_stats_operations = { .open = lockdep_stats_open, .read = seq_read, .llseek = seq_lseek,
kernel/module.c +1 -1
@@ -2182,7 +2182,7 @@ static int m_show(struct seq_file *m, voWhere refcount is a number or -, and deps is a comma-separated list of depends or -. */ -struct seq_operations modules_op = { +const struct seq_operations modules_op = { .start = m_start, .next = m_next, .stop = m_stop,
kernel/power/user.c +1 -1
@@ -321,7 +321,7 @@ OutS3:return error; } -static struct file_operations snapshot_fops = { +static const struct file_operations snapshot_fops = { .open = snapshot_open, .release = snapshot_release, .read = snapshot_read,
kernel/profile.c +1 -1
@@ -480,7 +480,7 @@ #endifreturn count; } -static struct file_operations proc_profile_operations = { +static const struct file_operations proc_profile_operations = { .read = read_profile, .write = write_profile, };
kernel/relay.c +1 -1
@@ -1011,7 +1011,7 @@ static ssize_t relay_file_sendfile(struc actor, &desc); } -struct file_operations relay_file_operations = { +const struct file_operations relay_file_operations = { .open = relay_file_open, .poll = relay_file_poll, .mmap = relay_file_mmap,
kernel/resource.c +3 -3
@@ -88,7 +88,7 @@ static int r_show(struct seq_file *m, voreturn 0 ; } -static struct seq_operations resource_op = { +static const struct seq_operations resource_op = { .start = r_start, .next = r_next, .stop = r_stop,
@@ -115,14 +115,14 @@ static int iomem_open(struct inode *inodreturn res; } -static struct file_operations proc_ioports_operations = { +static const struct file_operations proc_ioports_operations = { .open = ioports_open, .read = seq_read, .llseek = seq_lseek, .release = seq_release, }; -static struct file_operations proc_iomem_operations = { +static const struct file_operations proc_iomem_operations = { .open = iomem_open, .read = seq_read, .llseek = seq_lseek,
kernel/sched.c +1 -1
@@ -505,7 +505,7 @@ static int schedstat_open(struct inode *return res; } -struct file_operations proc_schedstat_operations = { +const struct file_operations proc_schedstat_operations = { .open = schedstat_open, .read = seq_read, .llseek = seq_lseek,
kernel/sysctl.c +1 -1
@@ -170,7 +170,7 @@ static ssize_t proc_readsys(struct filestatic ssize_t proc_writesys (struct file *,const char __user *,size_t ,loff_t *);static int proc_opensys (struct inode *,struct file *); -struct file_operations proc_sys_file_operations = { +const struct file_operations proc_sys_file_operations = { .open = proc_opensys, .read = proc_readsys, .write = proc_writesys,
mm/mempolicy.c +2 -2
@@ -1705,8 +1705,8 @@ void mpol_rebind_mm(struct mm_struct *mm* Display pages allocated per node and memory policy via /proc. */ -static const char *policy_types[] = {"default" ,"prefer" ,"bind" , -"interleave" }; +static const char *const policy_types[] = + {"default" ,"prefer" ,"bind" ,"interleave" };/* * Convert a mempolicy into a string.
mm/page_alloc.c +1 -1
@@ -90,7 +90,7 @@ EXPORT_SYMBOL(totalram_pages);struct zone *zone_table[1 <<ZONETABLE_SHIFT ]__read_mostly ;EXPORT_SYMBOL (zone_table); -static char *zone_names[MAX_NR_ZONES ] = { +static const char *const zone_names[MAX_NR_ZONES ] = {"DMA" , #ifdef CONFIG_ZONE_DMA32 "DMA32",
mm/shmem.c +2 -2
@@ -177,7 +177,7 @@ static inline void shmem_unacct_blocks(ustatic struct super_operations shmem_ops;static const struct address_space_operations shmem_aops; -static struct file_operations shmem_file_operations; +static const struct file_operations shmem_file_operations;static struct inode_operations shmem_inode_operations;static struct inode_operations shmem_dir_inode_operations;static struct inode_operations shmem_special_inode_operations;
@@ -2319,7 +2319,7 @@ #endif .migratepage = migrate_page, }; -static struct file_operations shmem_file_operations = { +static const struct file_operations shmem_file_operations = { .mmap = shmem_mmap, #ifdef CONFIG_TMPFS .llseek = generic_file_llseek,
mm/slab.c +2 -2
@@ -4038,7 +4038,7 @@ #endif* + further values on SMP and with statistics enabled */ -struct seq_operations slabinfo_op = { +const struct seq_operations slabinfo_op = { .start = s_start, .next = s_next, .stop = s_stop,
@@ -4236,7 +4236,7 @@ static int leaks_show(struct seq_file *mreturn 0 ; } -struct seq_operations slabstats_op = { +const struct seq_operations slabstats_op = { .start = leaks_start, .next = s_next, .stop = s_stop,
mm/swapfile.c +2 -2
@@ -1325,7 +1325,7 @@ static int swap_show(struct seq_file *swreturn 0 ; } -static struct seq_operations swaps_op = { +static const struct seq_operations swaps_op = { .start = swap_start, .next = swap_next, .stop = swap_stop,
@@ -1337,7 +1337,7 @@ static int swaps_open(struct inode *inodreturn seq_open (file, &swaps_op); } -static struct file_operations proc_swaps_operations = { +static const struct file_operations proc_swaps_operations = { .open = swaps_open, .read = seq_read, .llseek = seq_lseek,
mm/vmstat.c +4 -4
@@ -430,7 +430,7 @@ static int frag_show(struct seq_file *m,return 0 ; } -struct seq_operations fragmentation_op = { +const struct seq_operations fragmentation_op = { .start = frag_start, .next = frag_next, .stop = frag_stop,
@@ -452,7 +452,7 @@ #endif#define TEXTS_FOR_ZONES (xx) xx "_dma", TEXT_FOR_DMA32(xx) xx "_normal", \ TEXT_FOR_HIGHMEM(xx) -static char *vmstat_text[] = { +static const char *const vmstat_text[] = {/* Zoned VM counters */ "nr_anon_pages" ,"nr_mapped" ,
@@ -597,7 +597,7 @@ #endifreturn 0 ; } -struct seq_operations zoneinfo_op = { +const struct seq_operations zoneinfo_op = { .start = frag_start,/* iterate over all zones. The same as in * fragmentation. */ .next = frag_next,
@@ -660,7 +660,7 @@ static void vmstat_stop(struct seq_file m->private =NULL ; } -struct seq_operations vmstat_op = { +const struct seq_operations vmstat_op = { .start = vmstat_start, .next = vmstat_next, .stop = vmstat_stop,
Quoted 7 lines · Helge Deller
this trivial patch
- moves somefile_operationsstructs into the .rodata section
- moves static strings from policy_types[] array into the .rodata section
- fixes genericseq_operationsusages, so that those structs may be defined as "const" as welltested on ia32
patch was already sent on 1006-10-08
looks good and is a useful cleanup;
Acked-by Arjan van de Ven <[email protected]>