btrfs: Use round_down while calculating start position in btrfs_dirty_pages()
PATCH 1/1 btrfs: Use round_down while calculating start position in btrfs_dirty_pages()
From: Goldwyn Rodrigues <[email protected]>
round_down looks prettier than the bit mask operations.
--- fs/btrfs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/file.c +1 -1
@@ -514,7 +514,7 @@ int btrfs_dirty_pages(struct btrfs_inode *inode, struct page **pages,loff_t isize =i_size_read (&inode->vfs_inode);unsigned int extra_bits =0 ; - start_pos = pos & ~((u64 ) fs_info->sectorsize -1 ); + start_pos =round_down (pos, fs_info->sectorsize); num_bytes =round_up (write_bytes + pos - start_pos, fs_info->sectorsize);
Signature · 1 line
2.26.2
PATCH 1/1 btrfs: Set EXTENT_NORESERVE bits in btrfs_dirty_pages()
From: Goldwyn Rodrigues <[email protected]>
Set the extent bits EXTENT_NORESERVE in btrfs_dirty_pages() as opposed to calling set_extent_bits again later.
Fold check for written length within the function.
Note: EXTENT_NORESERVE is set before unlocking extents.
--- fs/btrfs/ctree.h | 2 +- fs/btrfs/file.c | 26 ++++++++++---------------- fs/btrfs/free-space-cache.c | 2 +- 3 files changed, 12 insertions(+), 18 deletions(-)
fs/btrfs/ctree.h +1 -1
@@ -3109,7 +3109,7 @@ int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,int btrfs_release_file (struct inode *inode,struct file *file);int btrfs_dirty_pages (struct btrfs_inode *inode,struct page **pages,size_t num_pages,loff_t pos,size_t write_bytes, -struct extent_state **cached); +struct extent_state **cached,bool noreserve);int btrfs_fdatawrite_range (struct inode *inode,loff_t start,loff_t end);int btrfs_check_nocow_lock (struct btrfs_inode *inode,loff_t pos,size_t *write_bytes);
fs/btrfs/file.c +10 -16
@@ -502,7 +502,7 @@ static int btrfs_find_new_delalloc_bytes(struct btrfs_inode *inode,*/ int btrfs_dirty_pages (struct btrfs_inode *inode,struct page **pages,size_t num_pages,loff_t pos,size_t write_bytes, -struct extent_state **cached) +struct extent_state **cached,bool noreserve) {struct btrfs_fs_info *fs_info = inode->root->fs_info;int err =0 ;
@@ -514,6 +514,12 @@ int btrfs_dirty_pages(struct btrfs_inode *inode, struct page **pages,loff_t isize =i_size_read (&inode->vfs_inode);unsigned int extra_bits =0 ; +if (write_bytes ==0 ) +return 0 ; + +if (noreserve) + extra_bits |=EXTENT_NORESERVE ; + start_pos =round_down (pos, fs_info->sectorsize); num_bytes =round_up (write_bytes + pos - start_pos, fs_info->sectorsize);
@@ -1787,10 +1793,9 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb, release_bytes =round_up (copied + sector_offset, fs_info->sectorsize); -if (copied >0 ) - ret =btrfs_dirty_pages (BTRFS_I (inode), pages, - dirty_pages, pos, copied, - &cached_state); + ret =btrfs_dirty_pages (BTRFS_I (inode), pages, + dirty_pages, pos, copied, + &cached_state, only_release_metadata);/* * If we have not locked the extent range, because the range's
@@ -1815,17 +1820,6 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,if (only_release_metadata)btrfs_check_nocow_unlock (BTRFS_I (inode)); -if (only_release_metadata && copied >0 ) { - lockstart =round_down (pos, - fs_info->sectorsize); - lockend =round_up (pos + copied, - fs_info->sectorsize) -1 ; - -set_extent_bit (&BTRFS_I (inode)->io_tree, lockstart, - lockend,EXTENT_NORESERVE ,NULL , -NULL ,GFP_NOFS ); - } -btrfs_drop_pages (pages, num_pages);cond_resched ();
fs/btrfs/free-space-cache.c +1 -1
@@ -1332,7 +1332,7 @@ static int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode,/* Everything is written out, now we dirty the pages in the file. */ ret =btrfs_dirty_pages (BTRFS_I (inode), io_ctl->pages, io_ctl->num_pages,0 ,i_size_read (inode), - &cached_state); + &cached_state, false);if (ret) goto out_nospc;
Signature · 1 line
2.26.2
Re: [PATCH] btrfs: Set EXTENT_NORESERVE bits in btrfs_dirty_pages()
Quoted 10 lines · Goldwyn Rodrigues
From: Goldwyn Rodrigues <[email protected]>
Set the extent bits
EXTENT_NORESERVEinbtrfs_dirty_pages()as opposed to callingset_extent_bitsagain later.Fold check for written length within the function.
Note:
EXTENT_NORESERVEis set before unlocking extents.Signed-off-by Goldwyn Rodrigues <[email protected]>
Quoted 5 lines · Goldwyn Rodrigues
From: Goldwyn Rodrigues <[email protected]>
round_downlooks prettier than the bit mask operations.Signed-off-by Goldwyn Rodrigues <[email protected]>
Quoted 5 lines · Goldwyn Rodrigues
From: Goldwyn Rodrigues <[email protected]>
round_downlooks prettier than the bit mask operations.Signed-off-by Goldwyn Rodrigues <[email protected]>
Thanks,
Qu
Quoted 18 lines
--- fs/btrfs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/btrfs/file.c +1
-1@@ -514,7 +514,7 @@ int btrfs_dirty_pages(struct btrfs_inode *inode, struct page **pages,loff_t isize =i_size_read (&inode->vfs_inode);unsigned int extra_bits =0 ; - start_pos = pos & ~((u64 ) fs_info->sectorsize -1 ); + start_pos =round_down (pos, fs_info->sectorsize); num_bytes =round_up (write_bytes + pos - start_pos, fs_info->sectorsize);
Quoted 5 lines · Goldwyn Rodrigues
From: Goldwyn Rodrigues <[email protected]>
round_downlooks prettier than the bit mask operations.Signed-off-by Goldwyn Rodrigues <[email protected]>
1 and 2 added to misc-next, thanks.