diff options
| author | Mark Brown <broonie@kernel.org> | 2026-05-29 12:27:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-05-29 12:27:14 +0100 |
| commit | fa872176b6ab36906ebb0e476122295f1446cf1f (patch) | |
| tree | afe53e780683d725e64dd3e987f3d930c5728ccf /fs | |
| parent | 916bbb9d6f2ff658c79971f0e6cc96530d45394e (diff) | |
| parent | f90ec429cf132dcfb5c75903bf8607d13b8fc47c (diff) | |
| download | linux-next-history-fa872176b6ab36906ebb0e476122295f1446cf1f.tar.gz | |
Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/erofs/zdata.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index 27ab7bd844ec7..c6240dccbb0f0 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -1455,6 +1455,9 @@ static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io, if (atomic_add_return(bios, &io->pending_bios)) return; if (z_erofs_in_atomic()) { + /* See `sync_decompress` in sysfs-fs-erofs for more details */ + if (sbi->sync_decompress == EROFS_SYNC_DECOMPRESS_AUTO) + sbi->sync_decompress = EROFS_SYNC_DECOMPRESS_FORCE_ON; #ifdef CONFIG_EROFS_FS_PCPU_KTHREAD struct kthread_worker *worker; @@ -1471,9 +1474,6 @@ static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io, #else queue_work(z_erofs_workqueue, &io->u.work); #endif - /* See `sync_decompress` in sysfs-fs-erofs for more details */ - if (sbi->sync_decompress == EROFS_SYNC_DECOMPRESS_AUTO) - sbi->sync_decompress = EROFS_SYNC_DECOMPRESS_FORCE_ON; return; } gfp_flag = memalloc_noio_save(); |