You've already forked linux-rockchip
mirror of
https://github.com/armbian/linux-rockchip.git
synced 2026-01-06 11:08:10 -08:00
btrfs: wake up async_delalloc_pages waiters after submit
commit ac98141d14 upstream.
We use the async_delalloc_pages mechanism to make sure that we've
completed our async work before trying to continue our delalloc
flushing. The reason for this is we need to see any ordered extents
that were created by our delalloc flushing. However we're waking up
before we do the submit work, which is before we create the ordered
extents. This is a pretty wide race window where we could potentially
think there are no ordered extents and thus exit shrink_delalloc
prematurely. Fix this by waking us up after we've done the work to
create ordered extents.
CC: stable@vger.kernel.org # 5.4+
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
9ac218642d
commit
0901af53da
@@ -1202,11 +1202,6 @@ static noinline void async_cow_submit(struct btrfs_work *work)
|
||||
nr_pages = (async_chunk->end - async_chunk->start + PAGE_SIZE) >>
|
||||
PAGE_SHIFT;
|
||||
|
||||
/* atomic_sub_return implies a barrier */
|
||||
if (atomic_sub_return(nr_pages, &fs_info->async_delalloc_pages) <
|
||||
5 * SZ_1M)
|
||||
cond_wake_up_nomb(&fs_info->async_submit_wait);
|
||||
|
||||
/*
|
||||
* ->inode could be NULL if async_chunk_start has failed to compress,
|
||||
* in which case we don't have anything to submit, yet we need to
|
||||
@@ -1215,6 +1210,11 @@ static noinline void async_cow_submit(struct btrfs_work *work)
|
||||
*/
|
||||
if (async_chunk->inode)
|
||||
submit_compressed_extents(async_chunk);
|
||||
|
||||
/* atomic_sub_return implies a barrier */
|
||||
if (atomic_sub_return(nr_pages, &fs_info->async_delalloc_pages) <
|
||||
5 * SZ_1M)
|
||||
cond_wake_up_nomb(&fs_info->async_submit_wait);
|
||||
}
|
||||
|
||||
static noinline void async_cow_free(struct btrfs_work *work)
|
||||
|
||||
Reference in New Issue
Block a user