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

btrfs: tree_search: eliminate redundant nr_items check

Browse Source 
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: Gerhard Heift <Gerhard@Heift.Name>
Signed-off-by: Chris Mason <clm@fb.com>
Acked-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Gerhard Heift 2014-01-30 16:23:57 +01:00 committed by Chris Mason
parent c7548af69d
commit 25c9bc2e2b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/btrfs/ioctl.c
View File

@ -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;
}