Constify structs
David Sterba
maintainerA few more additions of const, aiming for 4.5. Thanks.
----------------------------------------------------------------
The following changes since commit 8005c49d9aea74d382f474ce11afbbc7d7130bec:
Linux 4.4-rc1 (2015-11-15 17:00:27 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git cleanup/constify
for you to fetch changes up to de37f1d3a183e134a1a392309d79f2b3091204d7:
btrfs: constify static arrays (2015-11-18 17:13:41 +0100)
----------------------------------------------------------------
David Sterba (3):
btrfs tests: replace whole ops structure for free space tests
btrfs: constify remaining structs with function pointers
btrfs: constify static arrays
fs/btrfs/ctree.h | 2 +- fs/btrfs/free-space-cache.c | 2 +- fs/btrfs/free-space-cache.h | 2 +- fs/btrfs/inode-map.c | 4 ++-- fs/btrfs/inode.c | 6 +++--- fs/btrfs/ioctl.c | 2 +- fs/btrfs/super.c | 2 +- fs/btrfs/tests/free-space-tests.c | 14 ++++++++------ 8 files changed, 18 insertions(+), 16 deletions(-)
David Sterba
maintainerPATCH 1/3 btrfs tests: replace whole ops structure for free space tests
Preparatory work for making btrfs_free_space_op constant. In test_steal_space_from_bitmap_to_extent, we substitute use_bitmap with own version thus preventing constification. We can rework it so we replace the whole structure with the correct function pointers.
--- fs/btrfs/tests/free-space-tests.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
fs/btrfs/tests/free-space-tests.c +8 -6
@@ -445,9 +445,11 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)int ret;u64 offset;u64 max_extent_size; - -bool (*use_bitmap_op)(struct btrfs_free_space_ctl *, -struct btrfs_free_space *); +struct btrfs_free_space_op test_free_space_ops = { + .recalc_thresholds = cache->free_space_ctl->op->recalc_thresholds, + .use_bitmap = test_use_bitmap, + }; +struct btrfs_free_space_op *orig_free_space_ops;test_msg ("Running space stealing from bitmap to extent\n" );
@@ -469,8 +471,8 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)* that forces use of bitmaps as soon as we have at least 1 * extent entry. */ - use_bitmap_op = cache->free_space_ctl->op->use_bitmap; - cache->free_space_ctl->op->use_bitmap = test_use_bitmap; + orig_free_space_ops = cache->free_space_ctl->op; + cache->free_space_ctl->op = &test_free_space_ops;/* * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
@@ -877,7 +879,7 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)if (ret)return ret; - cache->free_space_ctl->op->use_bitmap = use_bitmap_op; + cache->free_space_ctl->op = orig_free_space_ops;__btrfs_remove_free_space_cache (cache->free_space_ctl);return 0 ;
Signature · 6 lines
2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-
David Sterba
maintainerPATCH 2/3 btrfs: constify remaining structs with function pointers
In reply to David Sterba* struct extent_io_ops
* struct btrfs_free_space_op
--- fs/btrfs/free-space-cache.c | 2 +- fs/btrfs/free-space-cache.h | 2 +- fs/btrfs/inode-map.c | 4 ++-- fs/btrfs/inode.c | 4 ++-- fs/btrfs/tests/free-space-tests.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-)
fs/btrfs/free-space-cache.c +1 -1
@@ -2016,7 +2016,7 @@ static bool use_bitmap(struct btrfs_free_space_ctl *ctl,return true; } -static struct btrfs_free_space_op free_space_op = { +static const struct btrfs_free_space_op free_space_op = { .recalc_thresholds = recalculate_thresholds, .use_bitmap = use_bitmap, };
fs/btrfs/free-space-cache.h +1 -1
@@ -37,7 +37,7 @@ struct btrfs_free_space_ctl {int total_bitmaps;int unit;u64 start; -struct btrfs_free_space_op *op; +const struct btrfs_free_space_op *op;void *private;struct mutex cache_writeout_mutex;struct list_head trimming_ranges;
fs/btrfs/inode-map.c +2 -2
@@ -334,7 +334,7 @@ static bool use_bitmap(struct btrfs_free_space_ctl *ctl,return true; } -static struct btrfs_free_space_op free_ino_op = { +static const struct btrfs_free_space_op free_ino_op = { .recalc_thresholds = recalculate_thresholds, .use_bitmap = use_bitmap, };
@@ -356,7 +356,7 @@ static bool pinned_use_bitmap(struct btrfs_free_space_ctl *ctl,return false; } -static struct btrfs_free_space_op pinned_free_ino_op = { +static const struct btrfs_free_space_op pinned_free_ino_op = { .recalc_thresholds = pinned_recalc_thresholds, .use_bitmap = pinned_use_bitmap, };
fs/btrfs/inode.c +2 -2
@@ -74,7 +74,7 @@ static const struct inode_operations btrfs_file_inode_operations;static const struct address_space_operations btrfs_aops;static const struct address_space_operations btrfs_symlink_aops;static const struct file_operations btrfs_dir_file_operations; -static struct extent_io_ops btrfs_extent_io_ops; +static const struct extent_io_ops btrfs_extent_io_ops;static struct kmem_cache *btrfs_inode_cachep;static struct kmem_cache *btrfs_delalloc_work_cachep;
@@ -10045,7 +10045,7 @@ static const struct file_operations btrfs_dir_file_operations = { .fsync = btrfs_sync_file, }; -static struct extent_io_ops btrfs_extent_io_ops = { +static const struct extent_io_ops btrfs_extent_io_ops = { .fill_delalloc = run_delalloc_range, .submit_bio_hook = btrfs_submit_bio_hook, .merge_bio_hook = btrfs_merge_bio_hook,
fs/btrfs/tests/free-space-tests.c +2 -2
@@ -445,11 +445,11 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)int ret;u64 offset;u64 max_extent_size; -struct btrfs_free_space_op test_free_space_ops = { +const struct btrfs_free_space_op test_free_space_ops = { .recalc_thresholds = cache->free_space_ctl->op->recalc_thresholds, .use_bitmap = test_use_bitmap, }; -struct btrfs_free_space_op *orig_free_space_ops; +const struct btrfs_free_space_op *orig_free_space_ops;test_msg ("Running space stealing from bitmap to extent\n" );
Signature · 6 lines
2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo
David Sterba
maintainerPATCH 3/3 btrfs: constify static arrays
In reply to David SterbaThere are a few statically initialized arrays that can be made const. The remaining (like file_system_type, sysfs attributes or prop handlers) do not allow that due to type mismatch when passed to the APIs or because the structures are modified through other members.
--- fs/btrfs/ctree.h | 2 +- fs/btrfs/inode.c | 2 +- fs/btrfs/ioctl.c | 2 +- fs/btrfs/super.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
fs/btrfs/ctree.h +1 -1
@@ -174,7 +174,7 @@ struct btrfs_ordered_sum;/* csum types */ #define BTRFS_CSUM_TYPE_CRC32 0 -static int btrfs_csum_sizes[] = {4 }; +static const int btrfs_csum_sizes[] = {4 };/* four bytes for CRC32 */ #define BTRFS_EMPTY_DIR_SIZE 0
fs/btrfs/inode.c +1 -1
@@ -84,7 +84,7 @@ struct kmem_cache *btrfs_path_cachep;struct kmem_cache *btrfs_free_space_cachep;#define S_SHIFT 12 -static unsigned char btrfs_type_by_mode[S_IFMT >>S_SHIFT ] = { +static const unsigned char btrfs_type_by_mode[S_IFMT >>S_SHIFT ] = { [S_IFREG >>S_SHIFT ] =BTRFS_FT_REG_FILE , [S_IFDIR >>S_SHIFT ] =BTRFS_FT_DIR , [S_IFCHR >>S_SHIFT ] =BTRFS_FT_CHRDEV ,
fs/btrfs/ioctl.c +1 -1
@@ -5286,7 +5286,7 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)static int btrfs_ioctl_get_supported_features (struct file *file,void __user *arg) { -static struct btrfs_ioctl_feature_flags features[3 ] = { +static const struct btrfs_ioctl_feature_flags features[3 ] = {INIT_FEATURE_FLAGS (SUPP ),INIT_FEATURE_FLAGS (SAFE_SET ),INIT_FEATURE_FLAGS (SAFE_CLEAR )
fs/btrfs/super.c +1 -1
@@ -309,7 +309,7 @@ enum { Opt_err, }; -static match_table_t tokens = { +static const match_table_t tokens = { {Opt_degraded,"degraded" }, {Opt_subvol,"subvol=%s" }, {Opt_subvolid,"subvolid=%s" },
Signature · 6 lines
2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-