iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: Refactor shrink_delalloc

Browse Source 
Add a couple of comments regarding the logic flow in shrink_delalloc.
Then, cease using max_reclaim as a temporary variable when calculating
nr_pages. Finally give max_reclaim a more becoming name, which
uneqivocally shows at what this variable really holds. No functional
changes.

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-01-03 10:50:05 +02:00 committed by David Sterba
parent 4546d17874
commit 420829d8ea
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fs/btrfs/extent-tree.c
View File

@ -4741,7 +4741,7 @@ static void shrink_delalloc(struct btrfs_fs_info *fs_info, u64 to_reclaim,
struct btrfs_space_info *space_info; struct btrfs_space_info *space_info;
struct btrfs_trans_handle *trans; struct btrfs_trans_handle *trans;
u64 delalloc_bytes; u64 delalloc_bytes;
u64 max_reclaim; u64 async_pages;
u64 items; u64 items;
long time_left; long time_left;
unsigned long nr_pages; unsigned long nr_pages;
@ -4766,25 +4766,36 @@ static void shrink_delalloc(struct btrfs_fs_info *fs_info, u64 to_reclaim,
loops = 0; loops = 0;
while (delalloc_bytes && loops < 3) { while (delalloc_bytes && loops < 3) {
max_reclaim = min(delalloc_bytes, to_reclaim); nr_pages = min(delalloc_bytes, to_reclaim) >> PAGE_SHIFT;
nr_pages = max_reclaim >> PAGE_SHIFT;
btrfs_writeback_inodes_sb_nr(fs_info, nr_pages, items);
/* /*
* We need to wait for the async pages to actually start before * Triggers inode writeback for up to nr_pages. This will invoke
* we do anything. * ->writepages callback and trigger delalloc filling
* (btrfs_run_delalloc_range()).
*/ */
max_reclaim = atomic_read(&fs_info->async_delalloc_pages); btrfs_writeback_inodes_sb_nr(fs_info, nr_pages, items);
if (!max_reclaim)
/*
* We need to wait for the compressed pages to start before
* we continue.
*/
async_pages = atomic_read(&fs_info->async_delalloc_pages);
if (!async_pages)
goto skip_async; goto skip_async;
if (max_reclaim <= nr_pages) /*
max_reclaim = 0; * Calculate how many compressed pages we want to be written
* before we continue. I.e if there are more async pages than we
* require wait_event will wait until nr_pages are written.
*/
if (async_pages <= nr_pages)
async_pages = 0;
else else
max_reclaim -= nr_pages; async_pages -= nr_pages;
wait_event(fs_info->async_submit_wait, wait_event(fs_info->async_submit_wait,
atomic_read(&fs_info->async_delalloc_pages) <= atomic_read(&fs_info->async_delalloc_pages) <=
(int)max_reclaim); (int)async_pages);
skip_async: skip_async:
spin_lock(&space_info->lock); spin_lock(&space_info->lock);
if (list_empty(&space_info->tickets) && if (list_empty(&space_info->tickets) &&