diff options
| author | Hugo Mills <hugo@carfax.org.uk> | 2011-05-14 17:43:41 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-23 13:05:39 -0400 |
| commit | e2156867159ae7b3bc38ef1c26ea0ee30a895ef8 (patch) | |
| tree | d949884cdaf5ebeb8d9ba14ec0284c9ece437164 /fs | |
| parent | 0956c798ef8dbe0fc215870eb68bd2d8e789f86a (diff) | |
| download | linux-3.10-e2156867159ae7b3bc38ef1c26ea0ee30a895ef8.tar.gz linux-3.10-e2156867159ae7b3bc38ef1c26ea0ee30a895ef8.tar.bz2 linux-3.10-e2156867159ae7b3bc38ef1c26ea0ee30a895ef8.zip | |
btrfs: Ensure the tree search ioctl returns the right number of records
Btrfs's tree search ioctl has a field to indicate that no more than a
given number of records should be returned. The ioctl doesn't honour
this, as the tested value is not incremented until the end of the
copy_to_sk function. This patch removes an unnecessary local variable,
and updates the num_found counter as each key is found in the tree.
Signed-off-by: Hugo Mills <hugo@carfax.org.uk>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 2616f7ed479..ce773fb736a 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1279,7 +1279,6 @@ static noinline int copy_to_sk(struct btrfs_root *root, int nritems; int i; int slot; - int found = 0; int ret = 0; leaf = path->nodes[0]; @@ -1326,7 +1325,7 @@ static noinline int copy_to_sk(struct btrfs_root *root, item_off, item_len); *sk_offset += item_len; } - found++; + (*num_found)++; if (*num_found >= sk->nr_items) break; @@ -1345,7 +1344,6 @@ advance_key: } else ret = 1; overflow: - *num_found += found; return ret; } |