From 9242075a7a02af76b697e34fb8c84bbb5d8cbfe9 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Wed, 1 Aug 2012 12:03:09 +0200 Subject: [PATCH] --- yaml --- r: 332510 b: refs/heads/master c: 3e126f32f88095ad1bd01b3c451e52aa9094f45c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/send.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 72ce9d43020e..51a7b917c2f8 100644 --- 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 index 3bc921aa5e21..b0f9df30f24d 100644 --- 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