fs: Remove SB_I_DYNBDI flag

jankara · axboe · commit c1844d536daf · 2017-04-20T12:09:55.000-06:00
Now that all bdi structures filesystems use are properly refcounted, we
can remove the SB_I_DYNBDI flag.

Reviewed-by: Christoph Hellwig &lt;hch@lst.de&gt;
Signed-off-by: Jan Kara &lt;jack@suse.cz&gt;
Signed-off-by: Jens Axboe &lt;axboe@fb.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ static int get_sb_mtd_set(struct super_block sb, void _mtd)`
`53`	`53`	`sb->s_mtd = mtd;`
`54`	`54`	`sb->s_dev = MKDEV(MTD_BLOCK_MAJOR, mtd->index);`
`55`	`55`	`sb->s_bdi = bdi_get(mtd_bdi);`
`56`		`- sb->s_iflags \|= SB_I_DYNBDI;`
`57`	`56`
`58`	`57`	`return 0;`
`59`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1224,7 +1224,6 @@ static int set_gfs2_super(struct super_block s, void data)`
`1224`	`1224`	`s->s_bdev = data;`
`1225`	`1225`	`s->s_dev = s->s_bdev->bd_dev;`
`1226`	`1226`	`s->s_bdi = bdi_get(s->s_bdev->bd_bdi);`
`1227`		`- s->s_iflags \|= SB_I_DYNBDI;`
`1228`	`1227`	`return 0;`
`1229`	`1228`	`}`
`1230`	`1229`
Original file line number	Diff line number	Diff line change
`@@ -2379,7 +2379,6 @@ int nfs_clone_super(struct super_block sb, struct nfs_mount_info mount_info)`
`2379`	`2379`	`nfs_initialise_sb(sb);`
`2380`	`2380`
`2381`	`2381`	`sb->s_bdi = bdi_get(old_sb->s_bdi);`
`2382`		`- sb->s_iflags \|= SB_I_DYNBDI;`
`2383`	`2382`
`2384`	`2383`	`return 0;`
`2385`	`2384`	`}`
Original file line number	Diff line number	Diff line change
`@@ -446,10 +446,9 @@ void generic_shutdown_super(struct super_block *sb)`
`446`	`446`	`hlist_del_init(&sb->s_instances);`
`447`	`447`	`spin_unlock(&sb_lock);`
`448`	`448`	`up_write(&sb->s_umount);`
`449`		`- if (sb->s_iflags & SB_I_DYNBDI) {`
	`449`	`+ if (sb->s_bdi != &noop_backing_dev_info) {`
`450`	`450`	`bdi_put(sb->s_bdi);`
`451`	`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`	`1054`	`s->s_bdev = data;`
`1056`	`1055`	`s->s_dev = s->s_bdev->bd_dev;`
`1057`	`1056`	`s->s_bdi = bdi_get(s->s_bdev->bd_bdi);`
`1058`		`- s->s_iflags \|= SB_I_DYNBDI;`
`1059`	`1057`
`1060`	`1058`	`return 0;`
`1061`	`1059`	`}`
`@@ -1282,7 +1280,6 @@ int super_setup_bdi_name(struct super_block sb, char fmt, ...)`
`1282`	`1280`	`}`
`1283`	`1281`	`WARN_ON(sb->s_bdi != &noop_backing_dev_info);`
`1284`	`1282`	`sb->s_bdi = bdi;`
`1285`		`- sb->s_iflags \|= SB_I_DYNBDI;`
`1286`	`1283`
`1287`	`1284`	`return 0;`
`1288`	`1285`	`}`