diff --git a/[refs] b/[refs] index 3d2bb6009901..433cf1500ef7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0956c798ef8dbe0fc215870eb68bd2d8e789f86a +refs/heads/master: e2156867159ae7b3bc38ef1c26ea0ee30a895ef8 diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c index 2616f7ed4799..ce773fb736a1 100644 --- a/trunk/fs/btrfs/ioctl.c +++ b/trunk/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 @@ static noinline int copy_to_sk(struct btrfs_root *root, } else ret = 1; overflow: - *num_found += found; return ret; }