diff options
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/disk-io.c | 2 | ||||
-rw-r--r-- | fs/btrfs/inode.c | 28 | ||||
-rw-r--r-- | fs/btrfs/super.c | 4 | ||||
-rw-r--r-- | fs/btrfs/tree-log.c | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 8b8192790011..6c4173146bb7 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -772,7 +772,7 @@ static void btree_invalidatepage(struct page *page, unsigned long offset) | |||
772 | } | 772 | } |
773 | } | 773 | } |
774 | 774 | ||
775 | static struct address_space_operations btree_aops = { | 775 | static const struct address_space_operations btree_aops = { |
776 | .readpage = btree_readpage, | 776 | .readpage = btree_readpage, |
777 | .writepage = btree_writepage, | 777 | .writepage = btree_writepage, |
778 | .writepages = btree_writepages, | 778 | .writepages = btree_writepages, |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 59cba180fe83..9096fd0ca3ca 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -55,13 +55,13 @@ struct btrfs_iget_args { | |||
55 | struct btrfs_root *root; | 55 | struct btrfs_root *root; |
56 | }; | 56 | }; |
57 | 57 | ||
58 | static struct inode_operations btrfs_dir_inode_operations; | 58 | static const struct inode_operations btrfs_dir_inode_operations; |
59 | static struct inode_operations btrfs_symlink_inode_operations; | 59 | static const struct inode_operations btrfs_symlink_inode_operations; |
60 | static struct inode_operations btrfs_dir_ro_inode_operations; | 60 | static const struct inode_operations btrfs_dir_ro_inode_operations; |
61 | static struct inode_operations btrfs_special_inode_operations; | 61 | static const struct inode_operations btrfs_special_inode_operations; |
62 | static struct inode_operations btrfs_file_inode_operations; | 62 | static const struct inode_operations btrfs_file_inode_operations; |
63 | static struct address_space_operations btrfs_aops; | 63 | static const struct address_space_operations btrfs_aops; |
64 | static struct address_space_operations btrfs_symlink_aops; | 64 | static const struct address_space_operations btrfs_symlink_aops; |
65 | static struct file_operations btrfs_dir_file_operations; | 65 | static struct file_operations btrfs_dir_file_operations; |
66 | static struct extent_io_ops btrfs_extent_io_ops; | 66 | static struct extent_io_ops btrfs_extent_io_ops; |
67 | 67 | ||
@@ -5201,7 +5201,7 @@ static int btrfs_permission(struct inode *inode, int mask) | |||
5201 | return generic_permission(inode, mask, btrfs_check_acl); | 5201 | return generic_permission(inode, mask, btrfs_check_acl); |
5202 | } | 5202 | } |
5203 | 5203 | ||
5204 | static struct inode_operations btrfs_dir_inode_operations = { | 5204 | static const struct inode_operations btrfs_dir_inode_operations = { |
5205 | .getattr = btrfs_getattr, | 5205 | .getattr = btrfs_getattr, |
5206 | .lookup = btrfs_lookup, | 5206 | .lookup = btrfs_lookup, |
5207 | .create = btrfs_create, | 5207 | .create = btrfs_create, |
@@ -5219,7 +5219,7 @@ static struct inode_operations btrfs_dir_inode_operations = { | |||
5219 | .removexattr = btrfs_removexattr, | 5219 | .removexattr = btrfs_removexattr, |
5220 | .permission = btrfs_permission, | 5220 | .permission = btrfs_permission, |
5221 | }; | 5221 | }; |
5222 | static struct inode_operations btrfs_dir_ro_inode_operations = { | 5222 | static const struct inode_operations btrfs_dir_ro_inode_operations = { |
5223 | .lookup = btrfs_lookup, | 5223 | .lookup = btrfs_lookup, |
5224 | .permission = btrfs_permission, | 5224 | .permission = btrfs_permission, |
5225 | }; | 5225 | }; |
@@ -5259,7 +5259,7 @@ static struct extent_io_ops btrfs_extent_io_ops = { | |||
5259 | * | 5259 | * |
5260 | * For now we're avoiding this by dropping bmap. | 5260 | * For now we're avoiding this by dropping bmap. |
5261 | */ | 5261 | */ |
5262 | static struct address_space_operations btrfs_aops = { | 5262 | static const struct address_space_operations btrfs_aops = { |
5263 | .readpage = btrfs_readpage, | 5263 | .readpage = btrfs_readpage, |
5264 | .writepage = btrfs_writepage, | 5264 | .writepage = btrfs_writepage, |
5265 | .writepages = btrfs_writepages, | 5265 | .writepages = btrfs_writepages, |
@@ -5271,14 +5271,14 @@ static struct address_space_operations btrfs_aops = { | |||
5271 | .set_page_dirty = btrfs_set_page_dirty, | 5271 | .set_page_dirty = btrfs_set_page_dirty, |
5272 | }; | 5272 | }; |
5273 | 5273 | ||
5274 | static struct address_space_operations btrfs_symlink_aops = { | 5274 | static const struct address_space_operations btrfs_symlink_aops = { |
5275 | .readpage = btrfs_readpage, | 5275 | .readpage = btrfs_readpage, |
5276 | .writepage = btrfs_writepage, | 5276 | .writepage = btrfs_writepage, |
5277 | .invalidatepage = btrfs_invalidatepage, | 5277 | .invalidatepage = btrfs_invalidatepage, |
5278 | .releasepage = btrfs_releasepage, | 5278 | .releasepage = btrfs_releasepage, |
5279 | }; | 5279 | }; |
5280 | 5280 | ||
5281 | static struct inode_operations btrfs_file_inode_operations = { | 5281 | static const struct inode_operations btrfs_file_inode_operations = { |
5282 | .truncate = btrfs_truncate, | 5282 | .truncate = btrfs_truncate, |
5283 | .getattr = btrfs_getattr, | 5283 | .getattr = btrfs_getattr, |
5284 | .setattr = btrfs_setattr, | 5284 | .setattr = btrfs_setattr, |
@@ -5290,7 +5290,7 @@ static struct inode_operations btrfs_file_inode_operations = { | |||
5290 | .fallocate = btrfs_fallocate, | 5290 | .fallocate = btrfs_fallocate, |
5291 | .fiemap = btrfs_fiemap, | 5291 | .fiemap = btrfs_fiemap, |
5292 | }; | 5292 | }; |
5293 | static struct inode_operations btrfs_special_inode_operations = { | 5293 | static const struct inode_operations btrfs_special_inode_operations = { |
5294 | .getattr = btrfs_getattr, | 5294 | .getattr = btrfs_getattr, |
5295 | .setattr = btrfs_setattr, | 5295 | .setattr = btrfs_setattr, |
5296 | .permission = btrfs_permission, | 5296 | .permission = btrfs_permission, |
@@ -5299,7 +5299,7 @@ static struct inode_operations btrfs_special_inode_operations = { | |||
5299 | .listxattr = btrfs_listxattr, | 5299 | .listxattr = btrfs_listxattr, |
5300 | .removexattr = btrfs_removexattr, | 5300 | .removexattr = btrfs_removexattr, |
5301 | }; | 5301 | }; |
5302 | static struct inode_operations btrfs_symlink_inode_operations = { | 5302 | static const struct inode_operations btrfs_symlink_inode_operations = { |
5303 | .readlink = generic_readlink, | 5303 | .readlink = generic_readlink, |
5304 | .follow_link = page_follow_link_light, | 5304 | .follow_link = page_follow_link_light, |
5305 | .put_link = page_put_link, | 5305 | .put_link = page_put_link, |
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 6d6d06cb6dfc..2db17cd66fc5 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -51,7 +51,7 @@ | |||
51 | #include "export.h" | 51 | #include "export.h" |
52 | #include "compression.h" | 52 | #include "compression.h" |
53 | 53 | ||
54 | static struct super_operations btrfs_super_ops; | 54 | static const struct super_operations btrfs_super_ops; |
55 | 55 | ||
56 | static void btrfs_put_super(struct super_block *sb) | 56 | static void btrfs_put_super(struct super_block *sb) |
57 | { | 57 | { |
@@ -675,7 +675,7 @@ static int btrfs_unfreeze(struct super_block *sb) | |||
675 | return 0; | 675 | return 0; |
676 | } | 676 | } |
677 | 677 | ||
678 | static struct super_operations btrfs_super_ops = { | 678 | static const struct super_operations btrfs_super_ops = { |
679 | .delete_inode = btrfs_delete_inode, | 679 | .delete_inode = btrfs_delete_inode, |
680 | .put_super = btrfs_put_super, | 680 | .put_super = btrfs_put_super, |
681 | .sync_fs = btrfs_sync_fs, | 681 | .sync_fs = btrfs_sync_fs, |
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index d91b0de7c502..30c0d45c1b5e 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -2605,7 +2605,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, | |||
2605 | extent); | 2605 | extent); |
2606 | cs = btrfs_file_extent_offset(src, extent); | 2606 | cs = btrfs_file_extent_offset(src, extent); |
2607 | cl = btrfs_file_extent_num_bytes(src, | 2607 | cl = btrfs_file_extent_num_bytes(src, |
2608 | extent);; | 2608 | extent); |
2609 | if (btrfs_file_extent_compression(src, | 2609 | if (btrfs_file_extent_compression(src, |
2610 | extent)) { | 2610 | extent)) { |
2611 | cs = 0; | 2611 | cs = 0; |