lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: cleanup: don't check the same thing twice

Browse Source 
btrfs_read_fs_root_no_name() already checks if btrfs_root_refs()
is zero and returns ENOENT in this case. There is no need to do
it again in six places.

Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
This commit is contained in:
Stefan Behrens
2013-05-13 13:53:35 +00:00
committed by Josef Bacik
parent b1b195969f
commit 3c64a1aba7
5 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/btrfs/inode.c
View File

@@ -2262,11 +2262,6 @@ static noinline int relink_extent_backref(struct btrfs_path *path,
return 0;
return PTR_ERR(root);
}
if (btrfs_root_refs(&root->root_item) == 0) {
srcu_read_unlock(&fs_info->subvol_srcu, index);
/* parse ENOENT to 0 */
return 0;
}
/* step 2: get inode */
key.objectid = backref->inum;
@@ -4821,11 +4816,6 @@ static int fixup_tree_root_location(struct btrfs_root *root,
goto out;
}
if (btrfs_root_refs(&new_root->root_item) == 0) {
err = -ENOENT;
goto out;
}
*sub_root = new_root;
location->objectid = btrfs_root_dirid(&new_root->root_item);
location->type = BTRFS_INODE_ITEM_KEY;