diff options
author | Christoph Hellwig <hch@lst.de> | 2015-01-14 04:42:41 -0500 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2015-01-20 16:05:38 -0500 |
commit | df0ce26cb4ee8bc233d50213b97213532aff0a3c (patch) | |
tree | bfc9ae26255daa5bd5d633520151223551faf016 /fs/super.c | |
parent | c4db59d31e39ea067c32163ac961e9c80198fd37 (diff) |
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 <hch@lst.de>
Reviewed-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/super.c')
-rw-r--r-- | fs/super.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/super.c b/fs/super.c index eae088f6aaae..3b4dadafdd60 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -185,8 +185,8 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags) | |||
185 | } | 185 | } |
186 | init_waitqueue_head(&s->s_writers.wait); | 186 | init_waitqueue_head(&s->s_writers.wait); |
187 | init_waitqueue_head(&s->s_writers.wait_unfrozen); | 187 | init_waitqueue_head(&s->s_writers.wait_unfrozen); |
188 | s->s_bdi = &noop_backing_dev_info; | ||
188 | s->s_flags = flags; | 189 | s->s_flags = flags; |
189 | s->s_bdi = &default_backing_dev_info; | ||
190 | INIT_HLIST_NODE(&s->s_instances); | 190 | INIT_HLIST_NODE(&s->s_instances); |
191 | INIT_HLIST_BL_HEAD(&s->s_anon); | 191 | INIT_HLIST_BL_HEAD(&s->s_anon); |
192 | INIT_LIST_HEAD(&s->s_inodes); | 192 | INIT_LIST_HEAD(&s->s_inodes); |
@@ -863,10 +863,7 @@ EXPORT_SYMBOL(free_anon_bdev); | |||
863 | 863 | ||
864 | int set_anon_super(struct super_block *s, void *data) | 864 | int set_anon_super(struct super_block *s, void *data) |
865 | { | 865 | { |
866 | int error = get_anon_bdev(&s->s_dev); | 866 | return get_anon_bdev(&s->s_dev); |
867 | if (!error) | ||
868 | s->s_bdi = &noop_backing_dev_info; | ||
869 | return error; | ||
870 | } | 867 | } |
871 | 868 | ||
872 | EXPORT_SYMBOL(set_anon_super); | 869 | EXPORT_SYMBOL(set_anon_super); |
@@ -1111,7 +1108,6 @@ mount_fs(struct file_system_type *type, int flags, const char *name, void *data) | |||
1111 | sb = root->d_sb; | 1108 | sb = root->d_sb; |
1112 | BUG_ON(!sb); | 1109 | BUG_ON(!sb); |
1113 | WARN_ON(!sb->s_bdi); | 1110 | WARN_ON(!sb->s_bdi); |
1114 | WARN_ON(sb->s_bdi == &default_backing_dev_info); | ||
1115 | sb->s_flags |= MS_BORN; | 1111 | sb->s_flags |= MS_BORN; |
1116 | 1112 | ||
1117 | error = security_sb_kern_mount(sb, flags, secdata); | 1113 | error = security_sb_kern_mount(sb, flags, secdata); |