diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-09-27 14:29:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-27 14:39:25 -0400 |
commit | f0f37e2f77731b3473fa6bd5ee53255d9a9cdb40 (patch) | |
tree | 3c26d3ed1a453156e9c208ccb5567a8954dba064 /fs | |
parent | 6f5071020d5ec89b5d095aa488db604adb921aec (diff) |
const: mark struct vm_struct_operations
* mark struct vm_area_struct::vm_ops as const
* mark vm_ops in AGP code
But leave TTM code alone, something is fishy there with global vm_ops
being used.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/file.c | 2 | ||||
-rw-r--r-- | fs/ext4/file.c | 2 | ||||
-rw-r--r-- | fs/fuse/file.c | 2 | ||||
-rw-r--r-- | fs/gfs2/file.c | 2 | ||||
-rw-r--r-- | fs/ncpfs/mmap.c | 2 | ||||
-rw-r--r-- | fs/nfs/file.c | 4 | ||||
-rw-r--r-- | fs/nilfs2/file.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/mmap.c | 2 | ||||
-rw-r--r-- | fs/sysfs/bin.c | 4 | ||||
-rw-r--r-- | fs/ubifs/file.c | 2 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_file.c | 4 |
11 files changed, 14 insertions, 14 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 571ad3c13b47..a3492a3ad96b 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
@@ -1184,7 +1184,7 @@ out: | |||
1184 | return ret > 0 ? EIO : ret; | 1184 | return ret > 0 ? EIO : ret; |
1185 | } | 1185 | } |
1186 | 1186 | ||
1187 | static struct vm_operations_struct btrfs_file_vm_ops = { | 1187 | static const struct vm_operations_struct btrfs_file_vm_ops = { |
1188 | .fault = filemap_fault, | 1188 | .fault = filemap_fault, |
1189 | .page_mkwrite = btrfs_page_mkwrite, | 1189 | .page_mkwrite = btrfs_page_mkwrite, |
1190 | }; | 1190 | }; |
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 5ca3eca70a1e..9630583cef28 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c | |||
@@ -81,7 +81,7 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov, | |||
81 | return generic_file_aio_write(iocb, iov, nr_segs, pos); | 81 | return generic_file_aio_write(iocb, iov, nr_segs, pos); |
82 | } | 82 | } |
83 | 83 | ||
84 | static struct vm_operations_struct ext4_file_vm_ops = { | 84 | static const struct vm_operations_struct ext4_file_vm_ops = { |
85 | .fault = filemap_fault, | 85 | .fault = filemap_fault, |
86 | .page_mkwrite = ext4_page_mkwrite, | 86 | .page_mkwrite = ext4_page_mkwrite, |
87 | }; | 87 | }; |
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index cbc464043b6f..a3492f7d207c 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
@@ -1313,7 +1313,7 @@ static int fuse_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
1313 | return 0; | 1313 | return 0; |
1314 | } | 1314 | } |
1315 | 1315 | ||
1316 | static struct vm_operations_struct fuse_file_vm_ops = { | 1316 | static const struct vm_operations_struct fuse_file_vm_ops = { |
1317 | .close = fuse_vma_close, | 1317 | .close = fuse_vma_close, |
1318 | .fault = filemap_fault, | 1318 | .fault = filemap_fault, |
1319 | .page_mkwrite = fuse_page_mkwrite, | 1319 | .page_mkwrite = fuse_page_mkwrite, |
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 166f38fbd246..4eb308aa3234 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c | |||
@@ -418,7 +418,7 @@ out: | |||
418 | return ret; | 418 | return ret; |
419 | } | 419 | } |
420 | 420 | ||
421 | static struct vm_operations_struct gfs2_vm_ops = { | 421 | static const struct vm_operations_struct gfs2_vm_ops = { |
422 | .fault = filemap_fault, | 422 | .fault = filemap_fault, |
423 | .page_mkwrite = gfs2_page_mkwrite, | 423 | .page_mkwrite = gfs2_page_mkwrite, |
424 | }; | 424 | }; |
diff --git a/fs/ncpfs/mmap.c b/fs/ncpfs/mmap.c index 5d8dcb9ee326..15458decdb8a 100644 --- a/fs/ncpfs/mmap.c +++ b/fs/ncpfs/mmap.c | |||
@@ -95,7 +95,7 @@ static int ncp_file_mmap_fault(struct vm_area_struct *area, | |||
95 | return VM_FAULT_MAJOR; | 95 | return VM_FAULT_MAJOR; |
96 | } | 96 | } |
97 | 97 | ||
98 | static struct vm_operations_struct ncp_file_mmap = | 98 | static const struct vm_operations_struct ncp_file_mmap = |
99 | { | 99 | { |
100 | .fault = ncp_file_mmap_fault, | 100 | .fault = ncp_file_mmap_fault, |
101 | }; | 101 | }; |
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 86d6b4db1096..f5fdd39e037a 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
@@ -59,7 +59,7 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl); | |||
59 | static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl); | 59 | static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl); |
60 | static int nfs_setlease(struct file *file, long arg, struct file_lock **fl); | 60 | static int nfs_setlease(struct file *file, long arg, struct file_lock **fl); |
61 | 61 | ||
62 | static struct vm_operations_struct nfs_file_vm_ops; | 62 | static const struct vm_operations_struct nfs_file_vm_ops; |
63 | 63 | ||
64 | const struct file_operations nfs_file_operations = { | 64 | const struct file_operations nfs_file_operations = { |
65 | .llseek = nfs_file_llseek, | 65 | .llseek = nfs_file_llseek, |
@@ -572,7 +572,7 @@ out_unlock: | |||
572 | return VM_FAULT_SIGBUS; | 572 | return VM_FAULT_SIGBUS; |
573 | } | 573 | } |
574 | 574 | ||
575 | static struct vm_operations_struct nfs_file_vm_ops = { | 575 | static const struct vm_operations_struct nfs_file_vm_ops = { |
576 | .fault = filemap_fault, | 576 | .fault = filemap_fault, |
577 | .page_mkwrite = nfs_vm_page_mkwrite, | 577 | .page_mkwrite = nfs_vm_page_mkwrite, |
578 | }; | 578 | }; |
diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c index fc8278c77cdd..7d7b4983dee3 100644 --- a/fs/nilfs2/file.c +++ b/fs/nilfs2/file.c | |||
@@ -117,7 +117,7 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
117 | return 0; | 117 | return 0; |
118 | } | 118 | } |
119 | 119 | ||
120 | struct vm_operations_struct nilfs_file_vm_ops = { | 120 | static const struct vm_operations_struct nilfs_file_vm_ops = { |
121 | .fault = filemap_fault, | 121 | .fault = filemap_fault, |
122 | .page_mkwrite = nilfs_page_mkwrite, | 122 | .page_mkwrite = nilfs_page_mkwrite, |
123 | }; | 123 | }; |
diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c index b606496b72ec..39737613424a 100644 --- a/fs/ocfs2/mmap.c +++ b/fs/ocfs2/mmap.c | |||
@@ -202,7 +202,7 @@ out: | |||
202 | return ret; | 202 | return ret; |
203 | } | 203 | } |
204 | 204 | ||
205 | static struct vm_operations_struct ocfs2_file_vm_ops = { | 205 | static const struct vm_operations_struct ocfs2_file_vm_ops = { |
206 | .fault = ocfs2_fault, | 206 | .fault = ocfs2_fault, |
207 | .page_mkwrite = ocfs2_page_mkwrite, | 207 | .page_mkwrite = ocfs2_page_mkwrite, |
208 | }; | 208 | }; |
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c index 2524714bece1..60c702bc10ae 100644 --- a/fs/sysfs/bin.c +++ b/fs/sysfs/bin.c | |||
@@ -40,7 +40,7 @@ struct bin_buffer { | |||
40 | struct mutex mutex; | 40 | struct mutex mutex; |
41 | void *buffer; | 41 | void *buffer; |
42 | int mmapped; | 42 | int mmapped; |
43 | struct vm_operations_struct *vm_ops; | 43 | const struct vm_operations_struct *vm_ops; |
44 | struct file *file; | 44 | struct file *file; |
45 | struct hlist_node list; | 45 | struct hlist_node list; |
46 | }; | 46 | }; |
@@ -331,7 +331,7 @@ static int bin_migrate(struct vm_area_struct *vma, const nodemask_t *from, | |||
331 | } | 331 | } |
332 | #endif | 332 | #endif |
333 | 333 | ||
334 | static struct vm_operations_struct bin_vm_ops = { | 334 | static const struct vm_operations_struct bin_vm_ops = { |
335 | .open = bin_vma_open, | 335 | .open = bin_vma_open, |
336 | .close = bin_vma_close, | 336 | .close = bin_vma_close, |
337 | .fault = bin_fault, | 337 | .fault = bin_fault, |
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index 2e6481a7701c..1009adc8d602 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c | |||
@@ -1534,7 +1534,7 @@ out_unlock: | |||
1534 | return err; | 1534 | return err; |
1535 | } | 1535 | } |
1536 | 1536 | ||
1537 | static struct vm_operations_struct ubifs_file_vm_ops = { | 1537 | static const struct vm_operations_struct ubifs_file_vm_ops = { |
1538 | .fault = filemap_fault, | 1538 | .fault = filemap_fault, |
1539 | .page_mkwrite = ubifs_vm_page_mkwrite, | 1539 | .page_mkwrite = ubifs_vm_page_mkwrite, |
1540 | }; | 1540 | }; |
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c index 988d8f87bc0f..629370974e57 100644 --- a/fs/xfs/linux-2.6/xfs_file.c +++ b/fs/xfs/linux-2.6/xfs_file.c | |||
@@ -42,7 +42,7 @@ | |||
42 | 42 | ||
43 | #include <linux/dcache.h> | 43 | #include <linux/dcache.h> |
44 | 44 | ||
45 | static struct vm_operations_struct xfs_file_vm_ops; | 45 | static const struct vm_operations_struct xfs_file_vm_ops; |
46 | 46 | ||
47 | STATIC ssize_t | 47 | STATIC ssize_t |
48 | xfs_file_aio_read( | 48 | xfs_file_aio_read( |
@@ -280,7 +280,7 @@ const struct file_operations xfs_dir_file_operations = { | |||
280 | .fsync = xfs_file_fsync, | 280 | .fsync = xfs_file_fsync, |
281 | }; | 281 | }; |
282 | 282 | ||
283 | static struct vm_operations_struct xfs_file_vm_ops = { | 283 | static const struct vm_operations_struct xfs_file_vm_ops = { |
284 | .fault = filemap_fault, | 284 | .fault = filemap_fault, |
285 | .page_mkwrite = xfs_vm_page_mkwrite, | 285 | .page_mkwrite = xfs_vm_page_mkwrite, |
286 | }; | 286 | }; |