Skip to content

Commit 4bca7e8

Browse files
committed
init: Initialize noop_backing_dev_info early
noop_backing_dev_info is used by superblocks of various pseudofilesystems such as kdevtmpfs. After commit 10e1407 ("writeback: Fix inode->i_io_list not be protected by inode->i_lock error") this broke because __mark_inode_dirty() started to access more fields from noop_backing_dev_info and this led to crashes inside locked_inode_to_wb_and_lock_list() called from __mark_inode_dirty(). Fix the problem by initializing noop_backing_dev_info before the filesystems get mounted. Fixes: 10e1407 ("writeback: Fix inode->i_io_list not be protected by inode->i_lock error") Reported-and-tested-by: Suzuki K Poulose <[email protected]> Reported-and-tested-by: Alexandru Elisei <[email protected]> Reported-and-tested-by: Guenter Roeck <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Jan Kara <[email protected]>
1 parent 27cfa25 commit 4bca7e8

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

drivers/base/init.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <linux/init.h>
99
#include <linux/memory.h>
1010
#include <linux/of.h>
11+
#include <linux/backing-dev.h>
1112

1213
#include "base.h"
1314

@@ -20,6 +21,7 @@
2021
void __init driver_init(void)
2122
{
2223
/* These are the core pieces */
24+
bdi_init(&noop_backing_dev_info);
2325
devtmpfs_init();
2426
devices_init();
2527
buses_init();

include/linux/backing-dev.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);
119119

120120
extern struct backing_dev_info noop_backing_dev_info;
121121

122+
int bdi_init(struct backing_dev_info *bdi);
123+
122124
/**
123125
* writeback_in_progress - determine whether there is writeback in progress
124126
* @wb: bdi_writeback of interest

mm/backing-dev.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -231,20 +231,13 @@ static __init int bdi_class_init(void)
231231
}
232232
postcore_initcall(bdi_class_init);
233233

234-
static int bdi_init(struct backing_dev_info *bdi);
235-
236234
static int __init default_bdi_init(void)
237235
{
238-
int err;
239-
240236
bdi_wq = alloc_workqueue("writeback", WQ_MEM_RECLAIM | WQ_UNBOUND |
241237
WQ_SYSFS, 0);
242238
if (!bdi_wq)
243239
return -ENOMEM;
244-
245-
err = bdi_init(&noop_backing_dev_info);
246-
247-
return err;
240+
return 0;
248241
}
249242
subsys_initcall(default_bdi_init);
250243

@@ -781,7 +774,7 @@ static void cgwb_remove_from_bdi_list(struct bdi_writeback *wb)
781774

782775
#endif /* CONFIG_CGROUP_WRITEBACK */
783776

784-
static int bdi_init(struct backing_dev_info *bdi)
777+
int bdi_init(struct backing_dev_info *bdi)
785778
{
786779
int ret;
787780

0 commit comments

Comments
 (0)