diff options
author | Jan Kara <jack@suse.cz> | 2017-04-12 06:24:47 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-04-20 14:09:55 -0400 |
commit | c1844d536dafa5f2cddf4b4841a3634f80a27666 (patch) | |
tree | cd45b315f2d205fa9f34a4cdb22a1511f1c39f65 /fs/super.c | |
parent | 99edd4580b7444f57d7494e6433cdbdb08d5a19d (diff) |
fs: Remove SB_I_DYNBDI flag
Now that all bdi structures filesystems use are properly refcounted, we
can remove the SB_I_DYNBDI flag.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/super.c b/fs/super.c index e267d3a00144..8444d26926ef 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -446,10 +446,9 @@ void generic_shutdown_super(struct super_block *sb) | |||
446 | hlist_del_init(&sb->s_instances); | 446 | hlist_del_init(&sb->s_instances); |
447 | spin_unlock(&sb_lock); | 447 | spin_unlock(&sb_lock); |
448 | up_write(&sb->s_umount); | 448 | up_write(&sb->s_umount); |
449 | if (sb->s_iflags & SB_I_DYNBDI) { | 449 | if (sb->s_bdi != &noop_backing_dev_info) { |
450 | bdi_put(sb->s_bdi); | 450 | bdi_put(sb->s_bdi); |
451 | sb->s_bdi = &noop_backing_dev_info; | 451 | sb->s_bdi = &noop_backing_dev_info; |
452 | sb->s_iflags &= ~SB_I_DYNBDI; | ||
453 | } | 452 | } |
454 | } | 453 | } |
455 | 454 | ||
@@ -1055,7 +1054,6 @@ static int set_bdev_super(struct super_block *s, void *data) | |||
1055 | s->s_bdev = data; | 1054 | s->s_bdev = data; |
1056 | s->s_dev = s->s_bdev->bd_dev; | 1055 | s->s_dev = s->s_bdev->bd_dev; |
1057 | s->s_bdi = bdi_get(s->s_bdev->bd_bdi); | 1056 | s->s_bdi = bdi_get(s->s_bdev->bd_bdi); |
1058 | s->s_iflags |= SB_I_DYNBDI; | ||
1059 | 1057 | ||
1060 | return 0; | 1058 | return 0; |
1061 | } | 1059 | } |
@@ -1282,7 +1280,6 @@ int super_setup_bdi_name(struct super_block *sb, char *fmt, ...) | |||
1282 | } | 1280 | } |
1283 | WARN_ON(sb->s_bdi != &noop_backing_dev_info); | 1281 | WARN_ON(sb->s_bdi != &noop_backing_dev_info); |
1284 | sb->s_bdi = bdi; | 1282 | sb->s_bdi = bdi; |
1285 | sb->s_iflags |= SB_I_DYNBDI; | ||
1286 | 1283 | ||
1287 | return 0; | 1284 | return 0; |
1288 | } | 1285 | } |