Commit dbb70bec authored by Chris Mason's avatar Chris Mason Committed by David Sterba

Btrfs: extent_write_locked_range() should attach inode->i_wb

extent_write_locked_range() is used when we're falling back to buffered
IO from inside of compression.  It allocates its own wbc and should
associate it with the inode's i_wb to make sure the IO goes down from
the correct cgroup.
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent ec39f769
...@@ -4255,6 +4255,7 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end, ...@@ -4255,6 +4255,7 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end,
.no_cgroup_owner = 1, .no_cgroup_owner = 1,
}; };
wbc_attach_fdatawrite_inode(&wbc_writepages, inode);
while (start <= end) { while (start <= end) {
page = find_get_page(mapping, start >> PAGE_SHIFT); page = find_get_page(mapping, start >> PAGE_SHIFT);
if (clear_page_dirty_for_io(page)) if (clear_page_dirty_for_io(page))
...@@ -4269,11 +4270,12 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end, ...@@ -4269,11 +4270,12 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end,
} }
ASSERT(ret <= 0); ASSERT(ret <= 0);
if (ret < 0) { if (ret == 0)
ret = flush_write_bio(&epd);
else
end_write_bio(&epd, ret); end_write_bio(&epd, ret);
return ret;
} wbc_detach_inode(&wbc_writepages);
ret = flush_write_bio(&epd);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment