korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-04 17:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: Make compress_file_range take only struct async_chunk

Browse Source 
All context this function needs is held within struct async_chunk.
Currently we not only pass the struct but also every individual member.
This is redundant, simplify it by only passing struct async_chunk and
leaving it to compress_file_range to extract the values it requires.
No functional changes.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2019-03-12 17:20:27 +02:00 committed by David Sterba
parent c5a68aec4e
commit 1368c6dac7
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/btrfs/inode.c
View File

@ -439,14 +439,14 @@ static inline void inode_should_defrag(struct btrfs_inode *inode,
* are written in the same order that the flusher thread sent them * are written in the same order that the flusher thread sent them
* down. * down.
*/ */
static noinline void compress_file_range(struct inode *inode, static noinline void compress_file_range(struct async_chunk *async_chunk,
struct page *locked_page,
u64 start, u64 end,
struct async_chunk *async_chunk,
int *num_added) int *num_added)
{ {
struct inode *inode = async_chunk->inode;
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
u64 blocksize = fs_info->sectorsize; u64 blocksize = fs_info->sectorsize;
u64 start = async_chunk->start;
u64 end = async_chunk->end;
u64 actual_end; u64 actual_end;
int ret = 0; int ret = 0;
struct page **pages = NULL; struct page **pages = NULL;
@ -665,9 +665,9 @@ cleanup_and_bail_uncompressed:
* to our extent and set things up for the async work queue to run * to our extent and set things up for the async work queue to run
* cow_file_range to do the normal delalloc dance. * cow_file_range to do the normal delalloc dance.
*/ */
if (page_offset(locked_page) >= start && if (page_offset(async_chunk->locked_page) >= start &&
page_offset(locked_page) <= end) page_offset(async_chunk->locked_page) <= end)
__set_page_dirty_nobuffers(locked_page); __set_page_dirty_nobuffers(async_chunk->locked_page);
/* unlocked later on in the async handlers */ /* unlocked later on in the async handlers */
if (redirty) if (redirty)
@ -1132,9 +1132,7 @@ static noinline void async_cow_start(struct btrfs_work *work)
async_chunk = container_of(work, struct async_chunk, work); async_chunk = container_of(work, struct async_chunk, work);
compress_file_range(async_chunk->inode, async_chunk->locked_page, compress_file_range(async_chunk, &num_added);
async_chunk->start, async_chunk->end, async_chunk,
&num_added);
if (num_added == 0) { if (num_added == 0) {
btrfs_add_delayed_iput(async_chunk->inode); btrfs_add_delayed_iput(async_chunk->inode);
async_chunk->inode = NULL; async_chunk->inode = NULL;