Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25c9bc2e authored by Gerhard Heift's avatar Gerhard Heift Committed by Chris Mason
Browse files

btrfs: tree_search: eliminate redundant nr_items check 



If the amount of items reached the given limit of nr_items, we can leave
copy_to_sk without updating the key. Also by returning 1 we leave the loop in
search_ioctl without rechecking if we reached the given limit.

Signed-off-by: default avatarGerhard Heift <Gerhard@Heift.Name>
Signed-off-by: default avatarChris Mason <clm@fb.com>
Acked-by: default avatarDavid Sterba <dsterba@suse.cz>
parent c7548af6

fs/btrfs/ioctl.c

+7 −5
Original line number Diff line number Diff line
@@ -1995,7 +1995,7 @@ static noinline int copy_to_sk(struct btrfs_root *root, 
		if (sizeof(sh) + item_len + *sk_offset >

		    BTRFS_SEARCH_ARGS_BUFSIZE) {

			ret = 1;

			goto overflow;

			goto out;

		}



		sh.objectid = key->objectid;
@@ -2017,8 +2017,10 @@ static noinline int copy_to_sk(struct btrfs_root *root, 
		}

		(*num_found)++;



		if (*num_found >= sk->nr_items)

			break;

		if (*num_found >= sk->nr_items) {

			ret = 1;

			goto out;

		}

	}

advance_key:

	ret = 0;
@@ -2033,7 +2035,7 @@ static noinline int copy_to_sk(struct btrfs_root *root, 
		key->objectid++;

	} else

		ret = 1;

overflow:

out:

	return ret;

}
@@ -2085,7 +2087,7 @@ static noinline int search_ioctl(struct inode *inode, 
		ret = copy_to_sk(root, path, &key, sk, args->buf,

				 &sk_offset, &num_found);

		btrfs_release_path(path);

		if (ret || num_found >= sk->nr_items)

		if (ret)

			break;



	}