diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-17 10:09:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-17 10:09:24 -0700 |
| commit | 5c0cd3d4a976b906c3953ff0a0595ba37e04aaa6 (patch) | |
| tree | fb4809fb9005d15637dda4c13be197809d519044 /mm | |
| parent | 274295c6e53f8b8b8dfa8b24a3fcb8a9d670c22c (diff) | |
| parent | 4bca7e80b6455772b4bf3f536dcbc19aac424d6a (diff) | |
| download | linux-5c0cd3d4a976b906c3953ff0a0595ba37e04aaa6.tar.bz2 | |
Merge tag 'fs_for_v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull writeback and ext2 fixes from Jan Kara:
"A fix for writeback bug which prevented machines with kdevtmpfs from
booting and also one small ext2 bugfix in IO error handling"
* tag 'fs_for_v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
init: Initialize noop_backing_dev_info early
ext2: fix fs corruption when trying to remove a non-empty directory with IO error
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/backing-dev.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index ff60bd7d74e0..95550b8fa7fe 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -231,20 +231,13 @@ static __init int bdi_class_init(void) } postcore_initcall(bdi_class_init); -static int bdi_init(struct backing_dev_info *bdi); - static int __init default_bdi_init(void) { - int err; - bdi_wq = alloc_workqueue("writeback", WQ_MEM_RECLAIM | WQ_UNBOUND | WQ_SYSFS, 0); if (!bdi_wq) return -ENOMEM; - - err = bdi_init(&noop_backing_dev_info); - - return err; + return 0; } subsys_initcall(default_bdi_init); @@ -781,7 +774,7 @@ static void cgwb_remove_from_bdi_list(struct bdi_writeback *wb) #endif /* CONFIG_CGROUP_WRITEBACK */ -static int bdi_init(struct backing_dev_info *bdi) +int bdi_init(struct backing_dev_info *bdi) { int ret; |