Commit c1844d53 authored by Jan Kara's avatar Jan Kara Committed by Jens Axboe

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 99edd458
...@@ -53,7 +53,6 @@ static int get_sb_mtd_set(struct super_block *sb, void *_mtd) ...@@ -53,7 +53,6 @@ static int get_sb_mtd_set(struct super_block *sb, void *_mtd)
sb->s_mtd = mtd; sb->s_mtd = mtd;
sb->s_dev = MKDEV(MTD_BLOCK_MAJOR, mtd->index); sb->s_dev = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
sb->s_bdi = bdi_get(mtd_bdi); sb->s_bdi = bdi_get(mtd_bdi);
sb->s_iflags |= SB_I_DYNBDI;
return 0; return 0;
} }
......
...@@ -1224,7 +1224,6 @@ static int set_gfs2_super(struct super_block *s, void *data) ...@@ -1224,7 +1224,6 @@ static int set_gfs2_super(struct super_block *s, void *data)
s->s_bdev = data; s->s_bdev = data;
s->s_dev = s->s_bdev->bd_dev; s->s_dev = s->s_bdev->bd_dev;
s->s_bdi = bdi_get(s->s_bdev->bd_bdi); s->s_bdi = bdi_get(s->s_bdev->bd_bdi);
s->s_iflags |= SB_I_DYNBDI;
return 0; return 0;
} }
......
...@@ -2379,7 +2379,6 @@ int nfs_clone_super(struct super_block *sb, struct nfs_mount_info *mount_info) ...@@ -2379,7 +2379,6 @@ int nfs_clone_super(struct super_block *sb, struct nfs_mount_info *mount_info)
nfs_initialise_sb(sb); nfs_initialise_sb(sb);
sb->s_bdi = bdi_get(old_sb->s_bdi); sb->s_bdi = bdi_get(old_sb->s_bdi);
sb->s_iflags |= SB_I_DYNBDI;
return 0; return 0;
} }
......
...@@ -1069,7 +1069,6 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -1069,7 +1069,6 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_max_links = NILFS_LINK_MAX; sb->s_max_links = NILFS_LINK_MAX;
sb->s_bdi = bdi_get(sb->s_bdev->bd_bdi); sb->s_bdi = bdi_get(sb->s_bdev->bd_bdi);
sb->s_iflags |= SB_I_DYNBDI;
err = load_nilfs(nilfs, sb); err = load_nilfs(nilfs, sb);
if (err) if (err)
......
...@@ -446,10 +446,9 @@ void generic_shutdown_super(struct super_block *sb) ...@@ -446,10 +446,9 @@ void generic_shutdown_super(struct super_block *sb)
hlist_del_init(&sb->s_instances); hlist_del_init(&sb->s_instances);
spin_unlock(&sb_lock); spin_unlock(&sb_lock);
up_write(&sb->s_umount); up_write(&sb->s_umount);
if (sb->s_iflags & SB_I_DYNBDI) { if (sb->s_bdi != &noop_backing_dev_info) {
bdi_put(sb->s_bdi); bdi_put(sb->s_bdi);
sb->s_bdi = &noop_backing_dev_info; sb->s_bdi = &noop_backing_dev_info;
sb->s_iflags &= ~SB_I_DYNBDI;
} }
} }
...@@ -1055,7 +1054,6 @@ static int set_bdev_super(struct super_block *s, void *data) ...@@ -1055,7 +1054,6 @@ static int set_bdev_super(struct super_block *s, void *data)
s->s_bdev = data; s->s_bdev = data;
s->s_dev = s->s_bdev->bd_dev; s->s_dev = s->s_bdev->bd_dev;
s->s_bdi = bdi_get(s->s_bdev->bd_bdi); s->s_bdi = bdi_get(s->s_bdev->bd_bdi);
s->s_iflags |= SB_I_DYNBDI;
return 0; return 0;
} }
...@@ -1282,7 +1280,6 @@ int super_setup_bdi_name(struct super_block *sb, char *fmt, ...) ...@@ -1282,7 +1280,6 @@ int super_setup_bdi_name(struct super_block *sb, char *fmt, ...)
} }
WARN_ON(sb->s_bdi != &noop_backing_dev_info); WARN_ON(sb->s_bdi != &noop_backing_dev_info);
sb->s_bdi = bdi; sb->s_bdi = bdi;
sb->s_iflags |= SB_I_DYNBDI;
return 0; return 0;
} }
......
...@@ -1272,9 +1272,6 @@ struct mm_struct; ...@@ -1272,9 +1272,6 @@ struct mm_struct;
/* sb->s_iflags to limit user namespace mounts */ /* sb->s_iflags to limit user namespace mounts */
#define SB_I_USERNS_VISIBLE 0x00000010 /* fstype already mounted */ #define SB_I_USERNS_VISIBLE 0x00000010 /* fstype already mounted */
/* Temporary flag until all filesystems are converted to dynamic bdis */
#define SB_I_DYNBDI 0x00000100
/* Possible states of 'frozen' field */ /* Possible states of 'frozen' field */
enum { enum {
SB_UNFROZEN = 0, /* FS is unfrozen */ SB_UNFROZEN = 0, /* FS is unfrozen */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment