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>

diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c
index e69e7855e31f7ce7f9b6775fbbe42e28c217c263..e43fea896d1ed8437a426a5fe0db010ceff7508a 100644 (file)
--- a/drivers/mtd/mtdsuper.c
+++ b/drivers/mtd/mtdsuper.c
@@ -53,7 +53,6 @@ static int get_sb_mtd_set(struct super_block *sb, void *_mtd)
        sb->s_mtd = mtd;
        sb->s_dev = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
        sb->s_bdi = bdi_get(mtd_bdi);
-       sb->s_iflags |= SB_I_DYNBDI;
 
        return 0;
 }

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index e6b6f97d0fc1a52e8930ddb9c36cd008fc1d3955..ed67548b286ccc58d84732d00af5ca281772bd39 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -1224,7 +1224,6 @@ static int set_gfs2_super(struct super_block *s, void *data)
        s->s_bdev = data;
        s->s_dev = s->s_bdev->bd_dev;
        s->s_bdi = bdi_get(s->s_bdev->bd_bdi);
-       s->s_iflags |= SB_I_DYNBDI;
        return 0;
 }
 

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 8d97aa70407e487b32400f7937db3a276d1edc2e..dc69314d455e7091e189362edcb02bfdd2508d63 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2379,7 +2379,6 @@ int nfs_clone_super(struct super_block *sb, struct nfs_mount_info *mount_info)
        nfs_initialise_sb(sb);
 
        sb->s_bdi = bdi_get(old_sb->s_bdi);
-       sb->s_iflags |= SB_I_DYNBDI;
 
        return 0;
 }

diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index feb796a38b8d4c8fe0de5146e7b0dcc5e77d0beb..926682981d61f0bd1671e9f49c1a0a8b80e72f03 100644 (file)
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -1069,7 +1069,6 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent)
        sb->s_max_links = NILFS_LINK_MAX;
 
        sb->s_bdi = bdi_get(sb->s_bdev->bd_bdi);
-       sb->s_iflags |= SB_I_DYNBDI;
 
        err = load_nilfs(nilfs, sb);
        if (err)

diff --git a/fs/super.c b/fs/super.c
index e267d3a00144ae0123136ea5bb28eaf9cd46c512..8444d26926ef70c4b29014dade66dccbd7c38b76 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -446,10 +446,9 @@ void generic_shutdown_super(struct super_block *sb)
        hlist_del_init(&sb->s_instances);
        spin_unlock(&sb_lock);
        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);
                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)
        s->s_bdev = data;
        s->s_dev = s->s_bdev->bd_dev;
        s->s_bdi = bdi_get(s->s_bdev->bd_bdi);
-       s->s_iflags |= SB_I_DYNBDI;
 
        return 0;
 }
@@ -1282,7 +1280,6 @@ int super_setup_bdi_name(struct super_block *sb, char *fmt, ...)
        }
        WARN_ON(sb->s_bdi != &noop_backing_dev_info);
        sb->s_bdi = bdi;
-       sb->s_iflags |= SB_I_DYNBDI;
 
        return 0;
 }

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 98cf14ea78c0e86c21ce3ac7a6a914643d8b06a7..30e5c14bd743364efd77b554fbb97a8649a0f2d1 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1272,9 +1272,6 @@ struct mm_struct;
 /* sb->s_iflags to limit user namespace mounts */
 #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 */
 enum {
        SB_UNFROZEN = 0,                /* FS is unfrozen */