[RFC 2/2] btrfs: use the new VFS super_block_dev

From: Luis R. Rodriguez
Date: Tue Jul 15 2014 - 19:07:58 EST


From: "Luis R. Rodriguez" <mcgrof@xxxxxxxx>

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@xxxxxxxx>
---
fs/btrfs/ctree.h | 7 ++-----
fs/btrfs/disk-io.c | 10 +++++-----
fs/btrfs/inode.c | 2 +-
3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index be91397..34247f6 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 8bb4aa1..edc64a8 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1269,7 +1269,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);
}
@@ -1572,9 +1571,11 @@ 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);
- if (ret)
+ root->sbdev = get_anon_sbdev(root->fs_info->sb);
+ if (!root->sbdev) {
+ ret = -ENOMEM;
goto free_writers;
+ }
return 0;

free_writers:
@@ -3529,8 +3530,7 @@ 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);
+ free_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..41a8bab 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.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/