Skip to content

Commit df0ce26

Browse files
Christoph Hellwigaxboe
authored andcommitted
fs: remove default_backing_dev_info
Now that default_backing_dev_info is not used for writeback purposes we can git rid of it easily: - instead of using it's name for tracing unregistered bdi we just use "unknown" - btrfs and ceph can just assign the default read ahead window themselves like several other filesystems already do. - we can assign noop_backing_dev_info as the default one in alloc_super. All filesystems already either assigned their own or noop_backing_dev_info. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Tejun Heo <[email protected]> Reviewed-by: Jan Kara <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent c4db59d commit df0ce26

File tree

6 files changed

+6
-22
lines changed

6 files changed

+6
-22
lines changed

fs/btrfs/disk-io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1719,7 +1719,7 @@ static int setup_bdi(struct btrfs_fs_info *info, struct backing_dev_info *bdi)
17191719
if (err)
17201720
return err;
17211721

1722-
bdi->ra_pages = default_backing_dev_info.ra_pages;
1722+
bdi->ra_pages = VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
17231723
bdi->congested_fn = btrfs_congested_fn;
17241724
bdi->congested_data = info;
17251725
return 0;

fs/ceph/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ static int ceph_register_bdi(struct super_block *sb,
899899
>> PAGE_SHIFT;
900900
else
901901
fsc->backing_dev_info.ra_pages =
902-
default_backing_dev_info.ra_pages;
902+
VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
903903

904904
err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
905905
atomic_long_inc_return(&bdi_seq));

fs/super.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags)
185185
}
186186
init_waitqueue_head(&s->s_writers.wait);
187187
init_waitqueue_head(&s->s_writers.wait_unfrozen);
188+
s->s_bdi = &noop_backing_dev_info;
188189
s->s_flags = flags;
189-
s->s_bdi = &default_backing_dev_info;
190190
INIT_HLIST_NODE(&s->s_instances);
191191
INIT_HLIST_BL_HEAD(&s->s_anon);
192192
INIT_LIST_HEAD(&s->s_inodes);
@@ -863,10 +863,7 @@ EXPORT_SYMBOL(free_anon_bdev);
863863

864864
int set_anon_super(struct super_block *s, void *data)
865865
{
866-
int error = get_anon_bdev(&s->s_dev);
867-
if (!error)
868-
s->s_bdi = &noop_backing_dev_info;
869-
return error;
866+
return get_anon_bdev(&s->s_dev);
870867
}
871868

872869
EXPORT_SYMBOL(set_anon_super);
@@ -1111,7 +1108,6 @@ mount_fs(struct file_system_type *type, int flags, const char *name, void *data)
11111108
sb = root->d_sb;
11121109
BUG_ON(!sb);
11131110
WARN_ON(!sb->s_bdi);
1114-
WARN_ON(sb->s_bdi == &default_backing_dev_info);
11151111
sb->s_flags |= MS_BORN;
11161112

11171113
error = security_sb_kern_mount(sb, flags, secdata);

include/linux/backing-dev.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);
241241
#define BDI_CAP_NO_ACCT_AND_WRITEBACK \
242242
(BDI_CAP_NO_WRITEBACK | BDI_CAP_NO_ACCT_DIRTY | BDI_CAP_NO_ACCT_WB)
243243

244-
extern struct backing_dev_info default_backing_dev_info;
245244
extern struct backing_dev_info noop_backing_dev_info;
246245

247246
int writeback_in_progress(struct backing_dev_info *bdi);

include/trace/events/writeback.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,8 @@ DECLARE_EVENT_CLASS(writeback_work_class,
156156
__field(int, reason)
157157
),
158158
TP_fast_assign(
159-
struct device *dev = bdi->dev;
160-
if (!dev)
161-
dev = default_backing_dev_info.dev;
162-
strncpy(__entry->name, dev_name(dev), 32);
159+
strncpy(__entry->name,
160+
bdi->dev ? dev_name(bdi->dev) : "(unknown)", 32);
163161
__entry->nr_pages = work->nr_pages;
164162
__entry->sb_dev = work->sb ? work->sb->s_dev : 0;
165163
__entry->sync_mode = work->sync_mode;

mm/backing-dev.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414

1515
static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
1616

17-
struct backing_dev_info default_backing_dev_info = {
18-
.name = "default",
19-
.ra_pages = VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE,
20-
};
21-
EXPORT_SYMBOL_GPL(default_backing_dev_info);
22-
2317
struct backing_dev_info noop_backing_dev_info = {
2418
.name = "noop",
2519
.capabilities = BDI_CAP_NO_ACCT_AND_WRITEBACK,
@@ -250,9 +244,6 @@ static int __init default_bdi_init(void)
250244
if (!bdi_wq)
251245
return -ENOMEM;
252246

253-
err = bdi_init(&default_backing_dev_info);
254-
if (!err)
255-
bdi_register(&default_backing_dev_info, NULL, "default");
256247
err = bdi_init(&noop_backing_dev_info);
257248

258249
return err;

0 commit comments

Comments
 (0)