diff options
| author |   Jeff Mahoney <jeffm@suse.com> | 2016-06-10 17:03:59 -0400 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2016-07-26 13:54:22 +0200 |
| commit | bd6c57dda666868abb222c1fa48e72f81db20e70 (patch) | |
| tree | bbdbbc50e46a2f9562ca647434d2112d6481717e /fs/btrfs | |
| parent | btrfs: tests, use BTRFS_FS_STATE_DUMMY_FS_INFO instead of dummy root (diff) | |
| download | linux-dev-bd6c57dda666868abb222c1fa48e72f81db20e70.tar.xz linux-dev-bd6c57dda666868abb222c1fa48e72f81db20e70.zip | |
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>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/props.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c index 36992128c746..cf0b444ac4f3 100644 --- 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); |