btrfs: simpilify btrfs_subvol_inherit_props

We just need a superblock, but we look it up using two different
roots depending on the call site.  Let's just use a superblock
pointer initialized at the outset.

This is mostly for Coccinelle not to choke on my root push up set.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index 3699212..cf0b444 100644 (file)
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -350,6 +350,7 @@ int btrfs_subvol_inherit_props(struct btrfs_trans_handle *trans,
                               struct btrfs_root *root,
                               struct btrfs_root *parent_root)
 {
+       struct super_block *sb = root->fs_info->sb;
        struct btrfs_key key;
        struct inode *parent_inode, *child_inode;
        int ret;
@@ -358,12 +359,11 @@ int btrfs_subvol_inherit_props(struct btrfs_trans_handle *trans,
        key.type = BTRFS_INODE_ITEM_KEY;
        key.offset = 0;
 
-       parent_inode = btrfs_iget(parent_root->fs_info->sb, &key,
-                                 parent_root, NULL);
+       parent_inode = btrfs_iget(sb, &key, parent_root, NULL);
        if (IS_ERR(parent_inode))
                return PTR_ERR(parent_inode);
 
-       child_inode = btrfs_iget(root->fs_info->sb, &key, root, NULL);
+       child_inode = btrfs_iget(sb, &key, root, NULL);
        if (IS_ERR(child_inode)) {
                iput(parent_inode);
                return PTR_ERR(child_inode);