From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
To: viro@zeniv.linux.org.uk, clm@fb.com, jbacik@fb.com, hch@infradead.org
Cc: linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org,
linux-kernel@vger.kernel.org, jeffm@suse.com, fdmanana@suse.com,
"Luis R. Rodriguez" <mcgrof@suse.com>
Subject: [RFC v3 2/2] btrfs: use the new VFS super_block_dev
Date: Thu, 14 Aug 2014 19:58:58 -0700 [thread overview]
Message-ID: <1408071538-14354-3-git-send-email-mcgrof@do-not-panic.com> (raw)
In-Reply-To: <1408071538-14354-1-git-send-email-mcgrof@do-not-panic.com>
From: "Luis R. Rodriguez" <mcgrof@suse.com>
Use the new VFS layer struct super_block_dev instead of carrying
the anonymous bdev's on our own. This makes the VFS layer aware of
all of our anonymous dev's on the super block.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
fdmanana: fix for running qgroup sanity tests
---
fs/btrfs/ctree.h | 7 ++-----
fs/btrfs/disk-io.c | 7 +++----
fs/btrfs/inode.c | 2 +-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index be91397..0ece396 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1846,11 +1846,8 @@ struct btrfs_root {
* protected by inode_lock
*/
struct radix_tree_root delayed_nodes_tree;
- /*
- * right now this just gets used so that a root has its own devid
- * for stat. It may be used for more later
- */
- dev_t anon_dev;
+
+ struct super_block_dev sbdev;
spinlock_t root_item_lock;
atomic_t refs;
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 08e65e9..7c65307 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1270,7 +1270,6 @@ static void __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
root->defrag_trans_start = 0;
init_completion(&root->kobj_unregister);
root->root_key.objectid = objectid;
- root->anon_dev = 0;
spin_lock_init(&root->root_item_lock);
}
@@ -1573,7 +1572,7 @@ int btrfs_init_fs_root(struct btrfs_root *root)
spin_lock_init(&root->cache_lock);
init_waitqueue_head(&root->cache_wait);
- ret = get_anon_bdev(&root->anon_dev);
+ ret = insert_anon_sbdev(root->fs_info->sb, &root->sbdev);
if (ret)
goto free_writers;
return 0;
@@ -3532,8 +3531,8 @@ static void free_fs_root(struct btrfs_root *root)
WARN_ON(!RB_EMPTY_ROOT(&root->inode_tree));
btrfs_free_block_rsv(root, root->orphan_block_rsv);
root->orphan_block_rsv = NULL;
- if (root->anon_dev)
- free_anon_bdev(root->anon_dev);
+ if (likely(!test_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state)))
+ remove_anon_sbdev(&root->sbdev);
if (root->subv_writers)
btrfs_free_subvolume_writers(root->subv_writers);
free_extent_buffer(root->node);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 3668048..0e8f604 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8277,7 +8277,7 @@ static int btrfs_getattr(struct vfsmount *mnt,
u32 blocksize = inode->i_sb->s_blocksize;
generic_fillattr(inode, stat);
- stat->dev = BTRFS_I(inode)->root->anon_dev;
+ stat->dev = BTRFS_I(inode)->root->sbdev.anon_dev;
stat->blksize = PAGE_CACHE_SIZE;
spin_lock(&BTRFS_I(inode)->lock);
--
2.0.3
next prev parent reply other threads:[~2014-08-15 2:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-15 2:58 [RFC v3 0/2] vfs / btrfs: add support for ustat() Luis R. Rodriguez
2014-08-15 2:58 ` [RFC v3 1/2] fs/super.c: add new super block sub devices super_block_dev Luis R. Rodriguez
2014-08-15 2:58 ` Luis R. Rodriguez [this message]
2014-08-15 9:29 ` [RFC v3 0/2] vfs / btrfs: add support for ustat() Al Viro
2014-08-17 23:41 ` Luis R. Rodriguez
2017-08-23 22:31 ` Jeff Mahoney
2021-04-15 17:53 ` Luis Chamberlain
2021-04-15 18:17 ` Josef Bacik
2021-04-15 18:29 ` Luis Chamberlain
2021-04-16 17:20 ` Neal Gompa
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=1408071538-14354-3-git-send-email-mcgrof@do-not-panic.com \
--to=mcgrof@do-not-panic.com \
--cc=clm@fb.com \
--cc=fdmanana@suse.com \
--cc=hch@infradead.org \
--cc=jbacik@fb.com \
--cc=jeffm@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@suse.com \
--cc=viro@zeniv.linux.org.uk \
/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).