From: Jan Kara <jack@suse.cz>
To: <linux-fsdevel@vger.kernel.org>
Cc: linux-block@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>, Jan Kara <jack@suse.cz>
Subject: [PATCH 23/25] fs: Remove SB_I_DYNBDI flag
Date: Wed, 29 Mar 2017 12:56:21 +0200 [thread overview]
Message-ID: <20170329105623.18241-24-jack@suse.cz> (raw)
In-Reply-To: <20170329105623.18241-1-jack@suse.cz>
Now that all bdi structures filesystems use are properly refcounted, we
can remove the SB_I_DYNBDI flag.
Signed-off-by: Jan Kara <jack@suse.cz>
---
drivers/mtd/mtdsuper.c | 1 -
fs/gfs2/ops_fstype.c | 1 -
fs/nfs/super.c | 1 -
fs/nilfs2/super.c | 1 -
fs/super.c | 5 +----
include/linux/fs.h | 3 ---
6 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c
index e69e7855e31f..e43fea896d1e 100644
--- 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 e6b6f97d0fc1..ed67548b286c 100644
--- 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 8d97aa70407e..dc69314d455e 100644
--- 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 feb796a38b8d..926682981d61 100644
--- 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 e267d3a00144..8444d26926ef 100644
--- 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 98cf14ea78c0..30e5c14bd743 100644
--- 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 */
--
2.10.2
next prev parent reply other threads:[~2017-03-29 10:56 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-29 10:55 [PATCH 0/25 v2] fs: Convert all embedded bdis into separate ones Jan Kara
2017-03-29 10:55 ` [PATCH 01/25] bdi: Provide bdi_register_va() and bdi_alloc() Jan Kara
2017-04-12 8:06 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 02/25] block: Unregister bdi on last reference drop Jan Kara
2017-04-12 8:06 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 03/25] bdi: Export bdi_alloc_node() and bdi_put() Jan Kara
2017-04-12 8:08 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 04/25] fs: Provide infrastructure for dynamic BDIs in filesystems Jan Kara
2017-04-12 8:09 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 05/25] fs: Get proper reference for s_bdi Jan Kara
2017-04-12 8:09 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 06/25] lustre: Convert to separately allocated bdi Jan Kara
2017-04-12 8:10 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 07/25] 9p: " Jan Kara
2017-04-12 8:10 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 08/25] btrfs: " Jan Kara
2017-04-12 8:10 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 09/25] ceph: " Jan Kara
2017-04-12 8:11 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 10/25] cifs: " Jan Kara
2017-04-12 8:11 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 11/25] ecryptfs: " Jan Kara
2017-04-12 8:11 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 12/25] afs: " Jan Kara
2017-04-12 8:12 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 13/25] mtd: Convert to dynamically allocated bdi infrastructure Jan Kara
2017-04-12 8:14 ` Christoph Hellwig
2017-04-12 9:43 ` Jan Kara
2017-03-29 10:56 ` [PATCH 14/25] coda: Convert to separately allocated bdi Jan Kara
2017-04-12 8:14 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 15/25] exofs: " Jan Kara
2017-04-12 8:14 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 16/25] fuse: " Jan Kara
2017-04-12 8:15 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 17/25] fuse: Get rid of bdi_initialized Jan Kara
2017-04-12 8:15 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 18/25] gfs2: Convert to properly refcounting bdi Jan Kara
2017-04-12 8:16 ` Christoph Hellwig
2017-04-12 8:48 ` Steven Whitehouse
2017-03-29 10:56 ` [PATCH 19/25] nilfs2: " Jan Kara
2017-04-12 8:17 ` Christoph Hellwig
2017-04-12 9:33 ` Jan Kara
2017-03-29 10:56 ` [PATCH 20/25] ncpfs: Convert to separately allocated bdi Jan Kara
2017-04-12 8:18 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 21/25] nfs: " Jan Kara
2017-04-12 8:20 ` Christoph Hellwig
2017-04-12 9:52 ` Jan Kara
2017-03-29 10:56 ` [PATCH 22/25] ubifs: " Jan Kara
2017-04-12 8:20 ` Christoph Hellwig
2017-03-29 10:56 ` Jan Kara [this message]
2017-04-12 8:21 ` [PATCH 23/25] fs: Remove SB_I_DYNBDI flag Christoph Hellwig
2017-03-29 10:56 ` [PATCH 24/25] block: Remove unused functions Jan Kara
2017-04-12 8:21 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 25/25] bdi: Drop 'parent' argument from bdi_register[_va]() Jan Kara
2017-04-12 8:21 ` Christoph Hellwig
2017-04-12 7:32 ` [PATCH 0/25 v2] fs: Convert all embedded bdis into separate ones Jan Kara
2017-04-12 10:24 [PATCH 0/25 v3] " Jan Kara
2017-04-12 10:24 ` [PATCH 23/25] fs: Remove SB_I_DYNBDI flag Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170329105623.18241-24-jack@suse.cz \
--to=jack@suse.cz \
--cc=hch@infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).