---

yaml --- r: 252324 b: refs/heads/master c: e215686 h: refs/heads/master v: v3
git-mirror · May 23, 2011 · a5d88a5 · a5d88a5
1 parent d4c9741
commit a5d88a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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;
 }