diff options
| author |   Naohiro Aota <naohiro.aota@wdc.com> | 2022-08-31 13:55:48 +0900 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2022-09-05 15:32:21 +0200 |
| commit | d5b81ced74afded85619ffbbe9c32ba9d82c9b1e (patch) | |
| tree | 69a37c31e1956ef64754541e9356e1ee41a1fe81 /fs/btrfs/disk-io.c | |
| parent | btrfs: add info when mount fails due to stale replace target (diff) | |
| download | linux-dev-d5b81ced74afded85619ffbbe9c32ba9d82c9b1e.tar.xz linux-dev-d5b81ced74afded85619ffbbe9c32ba9d82c9b1e.zip | |
btrfs: zoned: fix API misuse of zone finish waiting
The commit 2ce543f47843 ("btrfs: zoned: wait until zone is finished when
allocation didn't progress") implemented a zone finish waiting mechanism
to the write path of zoned mode. However, using
wait_var_event()/wake_up_all() on fs_info->zone_finish_wait is wrong and
wait_var_event() just hangs because no one ever wakes it up once it goes
into sleep.
Instead, we can simply use wait_on_bit_io() and clear_and_wake_up_bit()
on fs_info->flags with a proper barrier installed.
Fixes: 2ce543f47843 ("btrfs: zoned: wait until zone is finished when allocation didn't progress")
CC: stable@vger.kernel.org # 5.16+
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index b0345aa16c01..129711773ae5 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3070,7 +3070,6 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info) init_waitqueue_head(&fs_info->transaction_blocked_wait); init_waitqueue_head(&fs_info->async_submit_wait); init_waitqueue_head(&fs_info->delayed_iputs_wait); - init_waitqueue_head(&fs_info->zone_finish_wait); /* Usable values until the real ones are cached from the superblock */ fs_info->nodesize = 4096; |