diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/char_dev.c | 4 | ||||
-rw-r--r-- | fs/debugfs/inode.c | 2 | ||||
-rw-r--r-- | fs/inode.c | 2 | ||||
-rw-r--r-- | fs/nfsd/vfs.c | 2 | ||||
-rw-r--r-- | fs/proc/generic.c | 2 | ||||
-rw-r--r-- | fs/proc/internal.h | 2 | ||||
-rw-r--r-- | fs/proc/proc_misc.c | 2 | ||||
-rw-r--r-- | fs/select.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c index 8c6eb04d31e2..b53dffa46bac 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c | |||
@@ -250,7 +250,7 @@ int alloc_chrdev_region(dev_t *dev, unsigned baseminor, unsigned count, | |||
250 | } | 250 | } |
251 | 251 | ||
252 | int register_chrdev(unsigned int major, const char *name, | 252 | int register_chrdev(unsigned int major, const char *name, |
253 | struct file_operations *fops) | 253 | const struct file_operations *fops) |
254 | { | 254 | { |
255 | struct char_device_struct *cd; | 255 | struct char_device_struct *cd; |
256 | struct cdev *cdev; | 256 | struct cdev *cdev; |
@@ -473,7 +473,7 @@ struct cdev *cdev_alloc(void) | |||
473 | return p; | 473 | return p; |
474 | } | 474 | } |
475 | 475 | ||
476 | void cdev_init(struct cdev *cdev, struct file_operations *fops) | 476 | void cdev_init(struct cdev *cdev, const struct file_operations *fops) |
477 | { | 477 | { |
478 | memset(cdev, 0, sizeof *cdev); | 478 | memset(cdev, 0, sizeof *cdev); |
479 | INIT_LIST_HEAD(&cdev->list); | 479 | INIT_LIST_HEAD(&cdev->list); |
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index d4f1a2cddd47..85d166cdcae4 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
@@ -191,7 +191,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode, | |||
191 | */ | 191 | */ |
192 | struct dentry *debugfs_create_file(const char *name, mode_t mode, | 192 | struct dentry *debugfs_create_file(const char *name, mode_t mode, |
193 | struct dentry *parent, void *data, | 193 | struct dentry *parent, void *data, |
194 | struct file_operations *fops) | 194 | const struct file_operations *fops) |
195 | { | 195 | { |
196 | struct dentry *dentry = NULL; | 196 | struct dentry *dentry = NULL; |
197 | int error; | 197 | int error; |
diff --git a/fs/inode.c b/fs/inode.c index 1fddf2803af8..32b7c3375021 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -104,7 +104,7 @@ static struct inode *alloc_inode(struct super_block *sb) | |||
104 | { | 104 | { |
105 | static struct address_space_operations empty_aops; | 105 | static struct address_space_operations empty_aops; |
106 | static struct inode_operations empty_iops; | 106 | static struct inode_operations empty_iops; |
107 | static struct file_operations empty_fops; | 107 | static const struct file_operations empty_fops; |
108 | struct inode *inode; | 108 | struct inode *inode; |
109 | 109 | ||
110 | if (sb->s_op->alloc_inode) | 110 | if (sb->s_op->alloc_inode) |
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 5320e5afaddb..31018333dc38 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -706,7 +706,7 @@ nfsd_close(struct file *filp) | |||
706 | * after it. | 706 | * after it. |
707 | */ | 707 | */ |
708 | static inline int nfsd_dosync(struct file *filp, struct dentry *dp, | 708 | static inline int nfsd_dosync(struct file *filp, struct dentry *dp, |
709 | struct file_operations *fop) | 709 | const struct file_operations *fop) |
710 | { | 710 | { |
711 | struct inode *inode = dp->d_inode; | 711 | struct inode *inode = dp->d_inode; |
712 | int (*fsync) (struct file *, struct dentry *, int); | 712 | int (*fsync) (struct file *, struct dentry *, int); |
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 47b7a20d45eb..4ba03009cf72 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c | |||
@@ -560,7 +560,7 @@ static void proc_kill_inodes(struct proc_dir_entry *de) | |||
560 | struct file * filp = list_entry(p, struct file, f_u.fu_list); | 560 | struct file * filp = list_entry(p, struct file, f_u.fu_list); |
561 | struct dentry * dentry = filp->f_dentry; | 561 | struct dentry * dentry = filp->f_dentry; |
562 | struct inode * inode; | 562 | struct inode * inode; |
563 | struct file_operations *fops; | 563 | const struct file_operations *fops; |
564 | 564 | ||
565 | if (dentry->d_op != &proc_dentry_operations) | 565 | if (dentry->d_op != &proc_dentry_operations) |
566 | continue; | 566 | continue; |
diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 95a1cf32b838..0502f17b860d 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h | |||
@@ -30,7 +30,7 @@ do { \ | |||
30 | 30 | ||
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | extern void create_seq_entry(char *name, mode_t mode, struct file_operations *f); | 33 | extern void create_seq_entry(char *name, mode_t mode, const struct file_operations *f); |
34 | extern int proc_exe_link(struct inode *, struct dentry **, struct vfsmount **); | 34 | extern int proc_exe_link(struct inode *, struct dentry **, struct vfsmount **); |
35 | extern int proc_tid_stat(struct task_struct *, char *); | 35 | extern int proc_tid_stat(struct task_struct *, char *); |
36 | extern int proc_tgid_stat(struct task_struct *, char *); | 36 | extern int proc_tgid_stat(struct task_struct *, char *); |
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 1edce0c34bfd..ef5a3323f4b5 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
@@ -731,7 +731,7 @@ static struct file_operations proc_sysrq_trigger_operations = { | |||
731 | 731 | ||
732 | struct proc_dir_entry *proc_root_kcore; | 732 | struct proc_dir_entry *proc_root_kcore; |
733 | 733 | ||
734 | void create_seq_entry(char *name, mode_t mode, struct file_operations *f) | 734 | void create_seq_entry(char *name, mode_t mode, const struct file_operations *f) |
735 | { | 735 | { |
736 | struct proc_dir_entry *entry; | 736 | struct proc_dir_entry *entry; |
737 | entry = create_proc_entry(name, mode, NULL); | 737 | entry = create_proc_entry(name, mode, NULL); |
diff --git a/fs/select.c b/fs/select.c index 05cd199a1127..b3a3a1326af6 100644 --- a/fs/select.c +++ b/fs/select.c | |||
@@ -220,7 +220,7 @@ int do_select(int n, fd_set_bits *fds, s64 *timeout) | |||
220 | for (i = 0; i < n; ++rinp, ++routp, ++rexp) { | 220 | for (i = 0; i < n; ++rinp, ++routp, ++rexp) { |
221 | unsigned long in, out, ex, all_bits, bit = 1, mask, j; | 221 | unsigned long in, out, ex, all_bits, bit = 1, mask, j; |
222 | unsigned long res_in = 0, res_out = 0, res_ex = 0; | 222 | unsigned long res_in = 0, res_out = 0, res_ex = 0; |
223 | struct file_operations *f_op = NULL; | 223 | const struct file_operations *f_op = NULL; |
224 | struct file *file = NULL; | 224 | struct file *file = NULL; |
225 | 225 | ||
226 | in = *inp++; out = *outp++; ex = *exp++; | 226 | in = *inp++; out = *outp++; ex = *exp++; |