diff options
| author | Misono Tomohiro <misono.tomohiro@jp.fujitsu.com> | 2018-08-30 10:59:16 +0900 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-10-15 17:23:29 +0200 |
| commit | 380fd06640a7afe972e45310012c3e22d9c4783d (patch) | |
| tree | 14faf5bdb339dc3283d7de040ac14ca106ce9d55 /fs/btrfs/extent-tree.c | |
| parent | e49aabd973fd0b3e8e949bd9e7e05acbb9008244 (diff) | |
| download | linux-380fd06640a7afe972e45310012c3e22d9c4783d.tar.bz2 | |
btrfs: remove redundant variable from btrfs_cross_ref_exist
Since commit d7df2c796d7e ("Btrfs attach delayed ref updates to delayed
ref heads"), check_delayed_ref() won't return -ENOENT.
In btrfs_cross_ref_exist(), two variables 'ret' and 'ret2' are
originally used to handle -ENOENT error case. Since the code is not
needed anymore, let's just remove 'ret2'.
Signed-off-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 9292e7c0ee81..528f3308c32b 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -3139,7 +3139,6 @@ int btrfs_cross_ref_exist(struct btrfs_root *root, u64 objectid, u64 offset, { struct btrfs_path *path; int ret; - int ret2; path = btrfs_alloc_path(); if (!path) @@ -3151,17 +3150,9 @@ int btrfs_cross_ref_exist(struct btrfs_root *root, u64 objectid, u64 offset, if (ret && ret != -ENOENT) goto out; - ret2 = check_delayed_ref(root, path, objectid, - offset, bytenr); - } while (ret2 == -EAGAIN); + ret = check_delayed_ref(root, path, objectid, offset, bytenr); + } while (ret == -EAGAIN); - if (ret2 && ret2 != -ENOENT) { - ret = ret2; - goto out; - } - - if (ret != -ENOENT || ret2 != -ENOENT) - ret = 0; out: btrfs_free_path(path); if (root->root_key.objectid == BTRFS_DATA_RELOC_TREE_OBJECTID) |