---

yaml --- r: 332510 b: refs/heads/master c: 3e126f3 h: refs/heads/master v: v3
git-mirror · Oct 1, 2012 · 9242075 · 9242075
1 parent 0a8db62
commit 9242075
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e938c8ad543cd5ffe344371747484303ad51dfba
+refs/heads/master: 3e126f32f88095ad1bd01b3c451e52aa9094f45c
diff --git a/trunk/fs/btrfs/send.c b/trunk/fs/btrfs/send.c
@@ -864,7 +864,6 @@ static int iterate_dir_item(struct send_ctx *sctx,
 	struct extent_buffer *eb;
 	struct btrfs_item *item;
 	struct btrfs_dir_item *di;
-	struct btrfs_path *tmp_path = NULL;
 	struct btrfs_key di_key;
 	char *buf = NULL;
 	char *buf2 = NULL;
@@ -886,12 +885,6 @@ static int iterate_dir_item(struct send_ctx *sctx,
 		goto out;
 	}
 
-	tmp_path = alloc_path_for_send();
-	if (!tmp_path) {
-		ret = -ENOMEM;
-		goto out;
-	}
-
 	eb = path->nodes[0];
 	slot = path->slots[0];
 	item = btrfs_item_nr(eb, slot);
@@ -953,7 +946,6 @@ static int iterate_dir_item(struct send_ctx *sctx,
 	}
 
 out:
-	btrfs_free_path(tmp_path);
 	if (buf_virtual)
 		vfree(buf);
 	else