Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 00:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: replace async_cow::root with fs_info

Browse Source 
The async_cow::root is used to propagate fs_info to async_cow_submit.
We can't use inode to reach it because it could become NULL after
write without compression in async_cow_start.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2018-11-22 17:16:44 +01:00
parent 06ea01b1ee
commit 600b6cf468
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/btrfs/inode.c
View File

@ -358,7 +358,7 @@ struct async_extent {
struct async_cow { struct async_cow {
struct inode *inode; struct inode *inode;
struct btrfs_root *root; struct btrfs_fs_info *fs_info;
struct page *locked_page; struct page *locked_page;
u64 start; u64 start;
u64 end; u64 end;
@ -1144,13 +1144,11 @@ static noinline void async_cow_submit(struct btrfs_work *work)
{ {
struct btrfs_fs_info *fs_info; struct btrfs_fs_info *fs_info;
struct async_cow *async_cow; struct async_cow *async_cow;
struct btrfs_root *root;
unsigned long nr_pages; unsigned long nr_pages;
async_cow = container_of(work, struct async_cow, work); async_cow = container_of(work, struct async_cow, work);
root = async_cow->root; fs_info = async_cow->fs_info;
fs_info = root->fs_info;
nr_pages = (async_cow->end - async_cow->start + PAGE_SIZE) >> nr_pages = (async_cow->end - async_cow->start + PAGE_SIZE) >>
PAGE_SHIFT; PAGE_SHIFT;
@ -1179,7 +1177,6 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page,
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
struct async_cow *async_cow; struct async_cow *async_cow;
struct btrfs_root *root = BTRFS_I(inode)->root;
unsigned long nr_pages; unsigned long nr_pages;
u64 cur_end; u64 cur_end;
@ -1189,7 +1186,7 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page,
async_cow = kmalloc(sizeof(*async_cow), GFP_NOFS); async_cow = kmalloc(sizeof(*async_cow), GFP_NOFS);
BUG_ON(!async_cow); /* -ENOMEM */ BUG_ON(!async_cow); /* -ENOMEM */
async_cow->inode = igrab(inode); async_cow->inode = igrab(inode);
async_cow->root = root; async_cow->fs_info = fs_info;
async_cow->locked_page = locked_page; async_cow->locked_page = locked_page;
async_cow->start = start; async_cow->start = start;
async_cow->write_flags = write_flags; async_cow->write_flags = write_flags;