On Thu, Jul 19, 2018 at 01:05:14PM +0200, David Sterba wrote:
> The root is only used to get fs_info out of it, but the same can be
> retrieved from the inode that's in async_cow.
>
> Signed-off-by: David Sterba <dsterba@xxxxxxxx>
> ---
> fs/btrfs/inode.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 564ec00c765b..36b323b27dbf 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -358,7 +358,6 @@ struct async_extent {
>
> struct async_cow {
> struct inode *inode;
> - struct btrfs_root *root;
> struct page *locked_page;
> u64 start;
> u64 end;
> @@ -1144,13 +1143,11 @@ static noinline void async_cow_submit(struct btrfs_work *work)
> {
> struct btrfs_fs_info *fs_info;
> struct async_cow *async_cow;
> - struct btrfs_root *root;
> unsigned long nr_pages;
>
> async_cow = container_of(work, struct async_cow, work);
>
> - root = async_cow->root;
> - fs_info = root->fs_info;
> + fs_info = BTRFS_I(async_cow->inode)->root->fs_info;
This crashes if the inode is NULL, which can happen in async_cow_start
if compress_file_range returns 0 in num_added. The inode is moved to
delayed iputs and async_cow->inode zeroed.
Patch removed for now. We can reach the inode via the
async_cow::locked_page, but it's 5 pointers to chase and I want to have a
second thought on that if the 8 bytes in the structure is not cheaper.
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1143,11 +1143,13 @@ static noinline void async_cow_submit(struct btrfs_work *work)
{
struct btrfs_fs_info *fs_info;
struct async_cow *async_cow;
+ struct inode *inode;
unsigned long nr_pages;
async_cow = container_of(work, struct async_cow, work);
- fs_info = BTRFS_I(async_cow->inode)->root->fs_info;
+ inode = async_cow->locked_page->mapping->host;
+ fs_info = BTRFS_I(inode)->root->fs_info;
nr_pages = (async_cow->end - async_cow->start + PAGE_SIZE) >>
PAGE_SHIFT;
---
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
