Message ID | 1498637122-5200-1-git-send-email-nborisov@suse.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Jun 28, 2017 at 11:05:22AM +0300, Nikolay Borisov wrote: > The sectorsize member of btrfs_block_group_cache is unused. So remove it, this > reduces the number of holes in the struct. > > With patch: > /* size: 856, cachelines: 14, members: 40 */ > /* sum members: 837, holes: 4, sum holes: 19 */ > /* bit holes: 1, sum bit holes: 29 bits */ > /* last cacheline: 24 bytes */ > > Without patch: > /* size: 864, cachelines: 14, members: 41 */ > /* sum members: 841, holes: 5, sum holes: 23 */ > /* bit holes: 1, sum bit holes: 29 bits */ > /* last cacheline: 32 bytes */ > > Signed-off-by: Nikolay Borisov <nborisov@suse.com> > Reviewed-by: David Sterba <dsterba@suse.com> Strange that the error appeared just now, the code hasn't been modified recently. CC [M] fs/btrfs/tests/free-space-tree-tests.o fs/btrfs/tests/free-space-tree-tests.c: In function ‘__check_free_space_extents’: fs/btrfs/tests/free-space-tree-tests.c:84:20: error: ‘struct btrfs_block_group_cache’ has no member named ‘sectorsize’ offset += cache->sectorsize; ^~ make[1]: *** [scripts/Makefile.build:302: fs/btrfs/tests/free-space-tree-tests.o] Error 1 make: *** [Makefile:1684: fs/btrfs/] Error 2 I'll fix it. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index a75a23f9d68e..cdd3775e930b 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -559,7 +559,6 @@ struct btrfs_block_group_cache { u64 bytes_super; u64 flags; u64 cache_generation; - u32 sectorsize; /* * If the free space extent count exceeds this number, convert the block diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index a08a743a8e09..2a0d300c7d1a 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -9904,7 +9904,6 @@ btrfs_create_block_group_cache(struct btrfs_fs_info *fs_info, cache->key.offset = size; cache->key.type = BTRFS_BLOCK_GROUP_ITEM_KEY; - cache->sectorsize = fs_info->sectorsize; cache->fs_info = fs_info; cache->full_stripe_len = btrfs_full_stripe_len(fs_info, &fs_info->mapping_tree, diff --git a/fs/btrfs/tests/btrfs-tests.c b/fs/btrfs/tests/btrfs-tests.c index b18ab8f327a5..d3f25376a0f8 100644 --- a/fs/btrfs/tests/btrfs-tests.c +++ b/fs/btrfs/tests/btrfs-tests.c @@ -211,7 +211,6 @@ btrfs_alloc_dummy_block_group(struct btrfs_fs_info *fs_info, cache->key.objectid = 0; cache->key.offset = length; cache->key.type = BTRFS_BLOCK_GROUP_ITEM_KEY; - cache->sectorsize = fs_info->sectorsize; cache->full_stripe_len = fs_info->sectorsize; cache->fs_info = fs_info;