diff options
Diffstat (limited to 'fs/ramfs')
| -rw-r--r-- | fs/ramfs/file-mmu.c | 2 | ||||
| -rw-r--r-- | fs/ramfs/file-nommu.c | 6 | ||||
| -rw-r--r-- | fs/ramfs/inode.c | 1 | ||||
| -rw-r--r-- | fs/ramfs/internal.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c index 00a933eb820c..86f14cacf641 100644 --- a/fs/ramfs/file-mmu.c +++ b/fs/ramfs/file-mmu.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/fs.h> | 27 | #include <linux/fs.h> |
| 28 | 28 | ||
| 29 | struct address_space_operations ramfs_aops = { | 29 | const struct address_space_operations ramfs_aops = { |
| 30 | .readpage = simple_readpage, | 30 | .readpage = simple_readpage, |
| 31 | .prepare_write = simple_prepare_write, | 31 | .prepare_write = simple_prepare_write, |
| 32 | .commit_write = simple_commit_write | 32 | .commit_write = simple_commit_write |
diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c index f443a84b98a5..677139b48e00 100644 --- a/fs/ramfs/file-nommu.c +++ b/fs/ramfs/file-nommu.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | static int ramfs_nommu_setattr(struct dentry *, struct iattr *); | 28 | static int ramfs_nommu_setattr(struct dentry *, struct iattr *); |
| 29 | 29 | ||
| 30 | struct address_space_operations ramfs_aops = { | 30 | const struct address_space_operations ramfs_aops = { |
| 31 | .readpage = simple_readpage, | 31 | .readpage = simple_readpage, |
| 32 | .prepare_write = simple_prepare_write, | 32 | .prepare_write = simple_prepare_write, |
| 33 | .commit_write = simple_commit_write | 33 | .commit_write = simple_commit_write |
| @@ -283,9 +283,9 @@ unsigned long ramfs_nommu_get_unmapped_area(struct file *file, | |||
| 283 | 283 | ||
| 284 | /*****************************************************************************/ | 284 | /*****************************************************************************/ |
| 285 | /* | 285 | /* |
| 286 | * set up a mapping | 286 | * set up a mapping for shared memory segments |
| 287 | */ | 287 | */ |
| 288 | int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma) | 288 | int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma) |
| 289 | { | 289 | { |
| 290 | return 0; | 290 | return vma->vm_flags & VM_SHARED ? 0 : -ENOSYS; |
| 291 | } | 291 | } |
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index b9677335cc8d..bc0e51662424 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c | |||
| @@ -58,7 +58,6 @@ struct inode *ramfs_get_inode(struct super_block *sb, int mode, dev_t dev) | |||
| 58 | inode->i_mode = mode; | 58 | inode->i_mode = mode; |
| 59 | inode->i_uid = current->fsuid; | 59 | inode->i_uid = current->fsuid; |
| 60 | inode->i_gid = current->fsgid; | 60 | inode->i_gid = current->fsgid; |
| 61 | inode->i_blksize = PAGE_CACHE_SIZE; | ||
| 62 | inode->i_blocks = 0; | 61 | inode->i_blocks = 0; |
| 63 | inode->i_mapping->a_ops = &ramfs_aops; | 62 | inode->i_mapping->a_ops = &ramfs_aops; |
| 64 | inode->i_mapping->backing_dev_info = &ramfs_backing_dev_info; | 63 | inode->i_mapping->backing_dev_info = &ramfs_backing_dev_info; |
diff --git a/fs/ramfs/internal.h b/fs/ramfs/internal.h index 313237631b49..c2bb58e74653 100644 --- a/fs/ramfs/internal.h +++ b/fs/ramfs/internal.h | |||
| @@ -10,6 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | extern struct address_space_operations ramfs_aops; | 13 | extern const struct address_space_operations ramfs_aops; |
| 14 | extern const struct file_operations ramfs_file_operations; | 14 | extern const struct file_operations ramfs_file_operations; |
| 15 | extern struct inode_operations ramfs_file_inode_operations; | 15 | extern struct inode_operations ramfs_file_inode_operations; |
