Message ID | 1498488155-9941-1-git-send-email-nborisov@suse.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Nikolay, [auto build test ERROR on v4.12-rc6] [also build test ERROR on next-20170627] [cannot apply to btrfs/next] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Nikolay-Borisov/btrfs-remove-unused-sectorsize-member/20170627-183835 config: xtensa-allyesconfig (attached as .config) compiler: xtensa-linux-gcc (GCC) 4.9.0 reproduce: wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=xtensa All errors (new ones prefixed by >>): fs/btrfs/tests/btrfs-tests.c: In function 'btrfs_alloc_dummy_block_group': >> fs/btrfs/tests/btrfs-tests.c:214:7: error: 'struct btrfs_block_group_cache' has no member named 'sectorsize' cache->sectorsize = fs_info->sectorsize; ^ -- 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; ^ vim +214 fs/btrfs/tests/btrfs-tests.c 7c55ee0c Omar Sandoval 2015-09-29 208 return NULL; 7c55ee0c Omar Sandoval 2015-09-29 209 } 7c55ee0c Omar Sandoval 2015-09-29 210 7c55ee0c Omar Sandoval 2015-09-29 211 cache->key.objectid = 0; 7c55ee0c Omar Sandoval 2015-09-29 212 cache->key.offset = length; 7c55ee0c Omar Sandoval 2015-09-29 213 cache->key.type = BTRFS_BLOCK_GROUP_ITEM_KEY; da17066c Jeff Mahoney 2016-06-15 @214 cache->sectorsize = fs_info->sectorsize; da17066c Jeff Mahoney 2016-06-15 215 cache->full_stripe_len = fs_info->sectorsize; da17066c Jeff Mahoney 2016-06-15 216 cache->fs_info = fs_info; 7c55ee0c Omar Sandoval 2015-09-29 217 :::::: The code at line 214 was first introduced by commit :::::: da17066c40472c2d6a1aab7bb0090c3d285531c9 btrfs: pull node/sector/stripe sizes out of root and into fs_info :::::: TO: Jeff Mahoney <jeffm@suse.com> :::::: CC: David Sterba <dsterba@suse.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
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,
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> --- fs/btrfs/ctree.h | 1 - fs/btrfs/extent-tree.c | 1 - 2 files changed, 2 deletions(-)