btrfs: Remove logic for !crc_check case
PATCH 1/2 btrfs: Remove logic for !crc_check case
Following removal of the ino cache io_ctl_init will be called only on behalf of the freespace inode. In this case we always want to check crcs so conditional code that dependen on io_ctl::check_crc can be removed.
---
David,
Here are 2 patches that followup based on your feedback of the ino removal feature, I have run a full xfstest run to validate them.
fs/btrfs/free-space-cache.c | 38 ++++++------------------------------- fs/btrfs/free-space-cache.h | 1 - 2 files changed, 6 insertions(+), 33 deletions(-)
fs/btrfs/free-space-cache.c +6 -32
@@ -364,16 +364,11 @@ static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode, int write) {int num_pages; -int check_crcs =0 ; num_pages =DIV_ROUND_UP (i_size_read (inode),PAGE_SIZE ); -if (btrfs_ino (BTRFS_I (inode)) !=BTRFS_FREE_INO_OBJECTID ) - check_crcs =1 ; -/* Make sure we can fit our crcs and generation into the first page */ -if (write && check_crcs && - (num_pages *sizeof (u32) +sizeof (u64)) >PAGE_SIZE ) +if (write && (num_pages *sizeof (u32) +sizeof (u64)) >PAGE_SIZE )return -ENOSPC ;memset (io_ctl,0 ,sizeof (struct btrfs_io_ctl ));
@@ -384,7 +379,6 @@ static int io_ctl_init(struct btrfs_io_ctl *io_ctl, struct inode *inode, io_ctl->num_pages = num_pages; io_ctl->fs_info =btrfs_sb (inode->i_sb); - io_ctl->check_crcs = check_crcs; io_ctl->inode = inode;return 0 ;
@@ -479,13 +473,8 @@ static void io_ctl_set_generation(struct btrfs_io_ctl *io_ctl, u64 generation)* Skip the csum areas. If we don't check crcs then we just have a * 64bit chunk at the front of the first page. */ -if (io_ctl->check_crcs) { - io_ctl->cur += (sizeof (u32) * io_ctl->num_pages); - io_ctl->size -=sizeof (u64) + (sizeof (u32) * io_ctl->num_pages); - }else { - io_ctl->cur +=sizeof (u64); - io_ctl->size -=sizeof (u64) *2 ; - } + io_ctl->cur += (sizeof (u32) * io_ctl->num_pages); + io_ctl->size -=sizeof (u64) + (sizeof (u32) * io_ctl->num_pages);put_unaligned_le64 (generation, io_ctl->cur); io_ctl->cur +=sizeof (u64);
@@ -499,14 +488,9 @@ static int io_ctl_check_generation(struct btrfs_io_ctl *io_ctl, u64 generation)* Skip the crc area. If we don't check crcs then we just have a 64bit * chunk at the front of the first page. */ -if (io_ctl->check_crcs) { - io_ctl->cur +=sizeof (u32) * io_ctl->num_pages; - io_ctl->size -=sizeof (u64) + - (sizeof (u32) * io_ctl->num_pages); - }else { - io_ctl->cur +=sizeof (u64); - io_ctl->size -=sizeof (u64) *2 ; - } + io_ctl->cur +=sizeof (u32) * io_ctl->num_pages; + io_ctl->size -=sizeof (u64) + + (sizeof (u32) * io_ctl->num_pages); cache_gen =get_unaligned_le64 (io_ctl->cur);if (cache_gen != generation) {
@@ -526,11 +510,6 @@ static void io_ctl_set_crc(struct btrfs_io_ctl *io_ctl, int index)u32 crc = ~(u32 )0 ;unsigned offset =0 ; -if (!io_ctl->check_crcs) { -io_ctl_unmap_page (io_ctl); -return ; - } -if (index ==0 ) offset =sizeof (u32) * io_ctl->num_pages;
@@ -548,11 +527,6 @@ static int io_ctl_check_crc(struct btrfs_io_ctl *io_ctl, int index)u32 crc = ~(u32 )0 ;unsigned offset =0 ; -if (!io_ctl->check_crcs) { -io_ctl_map_page (io_ctl,0 ); -return 0 ; - } -if (index ==0 ) offset =sizeof (u32) * io_ctl->num_pages;
fs/btrfs/free-space-cache.h +0 -1
@@ -76,7 +76,6 @@ struct btrfs_io_ctl {int num_pages;int entries;int bitmaps; - unsigned check_crcs:1; }; struct inode *lookup_free_space_inode(struct btrfs_block_group *block_group,
--
2.25.1
PATCH 2/2 btrfs: Always set NODATASUM/NODATACOW in __create_free_space_inode
Since it's being used solely for the freespace cache unconditionally set the flags required for it.
--- fs/btrfs/free-space-cache.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
fs/btrfs/free-space-cache.c +3 -5
@@ -142,17 +142,15 @@ static int __create_free_space_inode(struct btrfs_root *root,struct btrfs_free_space_header *header;struct btrfs_inode_item *inode_item;struct extent_buffer *leaf; -u64 flags =BTRFS_INODE_NOCOMPRESS |BTRFS_INODE_PREALLOC ; +/* We inline crc's for the free disk space cache */ +u64 flags =BTRFS_INODE_NOCOMPRESS |BTRFS_INODE_PREALLOC | +BTRFS_INODE_NODATASUM |BTRFS_INODE_NODATACOW ;int ret; ret =btrfs_insert_empty_inode (trans, root, path, ino);if (ret)return ret; -/* We inline crc's for the free disk space cache */ -if (ino !=BTRFS_FREE_INO_OBJECTID ) - flags |=BTRFS_INODE_NODATASUM |BTRFS_INODE_NODATACOW ; - leaf = path->nodes[0 ]; inode_item =btrfs_item_ptr (leaf, path->slots[0 ], struct btrfs_inode_item);
Signature · 1 line
2.25.1
Quoted 11 lines · Nikolay Borisov
Following removal of the ino cache
io_ctl_initwill be called only on behalf of the freespace inode. In this case we always want to check crcs so conditional code that dependen onio_ctl::check_crccan be removed.Signed-off-by Nikolay Borisov <[email protected]>---
David,Here are 2 patches that followup based on your feedback of the ino removal feature, I have run a full xfstest run to validate them.
Thanks, added after the ino removal in misc-next.