]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
btrfs: simplify lookup_data_extent()
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Tue, 10 May 2022 19:43:38 +0000 (21:43 +0200)
committerTom Rini <trini@konsulko.com>
Mon, 6 Jun 2022 21:47:17 +0000 (17:47 -0400)
After returning if ret <= 0 we know that ret > 0. No need to check it.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Anand Jain <anand.jain>
fs/btrfs/inode.c

index d00b5153336d9b13dfedf7403a5b3d5c5dfd2e6f..0173d30cd8ab392712221d00bbb1bad76bd50122 100644 (file)
@@ -546,15 +546,12 @@ static int lookup_data_extent(struct btrfs_root *root, struct btrfs_path *path,
        /* Error or we're already at the file extent */
        if (ret <= 0)
                return ret;
-       if (ret > 0) {
-               /* Check previous file extent */
-               ret = btrfs_previous_item(root, path, ino,
-                                         BTRFS_EXTENT_DATA_KEY);
-               if (ret < 0)
-                       return ret;
-               if (ret > 0)
-                       goto check_next;
-       }
+       /* Check previous file extent */
+       ret = btrfs_previous_item(root, path, ino, BTRFS_EXTENT_DATA_KEY);
+       if (ret < 0)
+               return ret;
+       if (ret > 0)
+               goto check_next;
        /* Now the key.offset must be smaller than @file_offset */
        btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
        if (key.objectid != ino ||