From 045d175a71818a6f32e1ff94b64ff84cd0758bd2 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@googlemail.com>
Date: Sat, 28 Jul 2012 11:07:18 +0200
Subject: [PATCH] --- yaml --- r: 332496 b: refs/heads/master c:
 b9291affaa4576762c30fb31083f33f5d745dea1 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/btrfs/send.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9df4150b6f39..83f95ccc1527 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f4692da951af4179a6522c6b48a09a43d37e614
+refs/heads/master: b9291affaa4576762c30fb31083f33f5d745dea1
diff --git a/trunk/fs/btrfs/send.c b/trunk/fs/btrfs/send.c
index a5fae484d4e1..bea5b4378cc5 100644
--- a/trunk/fs/btrfs/send.c
+++ b/trunk/fs/btrfs/send.c
@@ -1589,7 +1589,7 @@ static int is_first_ref(struct send_ctx *sctx,
 	if (ret < 0)
 		goto out;
 
-	if (name_len != fs_path_len(tmp_name)) {
+	if (dir != tmp_dir || name_len != fs_path_len(tmp_name)) {
 		ret = 0;
 		goto out;
 	}