From cc2760fd41a688b9c34756af5036cdbab2696b70 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Thu, 14 Jul 2011 03:16:00 +0000
Subject: [PATCH] --- yaml --- r: 262239 b: refs/heads/master c:
 77906a5075a4eb767026c2e07b1a412d08aea5be h: refs/heads/master i:   262237:
 2c78f9d05be0e449b49bfe633f5a39f88f5d7b24   262235:
 6cef01e8db303656b55f39068b917616b89bfb52   262231:
 ba84089fdc7fe6b4fef37aa8fcd8e8e038a21c80   262223:
 6c2068a80c212796c40b1f5c74c2ce02cfaffba7   262207:
 796a8681f917901e38ea8c213b698f24273a277d v: v3

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

diff --git a/[refs] b/[refs]
index 300343208375..ee82cdfd9122 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b783e62d9620445d1ca3de76badf0468cdd329ba
+refs/heads/master: 77906a5075a4eb767026c2e07b1a412d08aea5be
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index fd252fff4c66..2bb08862a4f6 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -1757,11 +1757,10 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info,
 		key.objectid = key.offset;
 		key.offset = (u64)-1;
 		dirid = key.objectid;
-
 	}
 	if (ptr < name)
 		goto out;
-	memcpy(name, ptr, total_len);
+	memmove(name, ptr, total_len);
 	name[total_len]='\0';
 	ret = 0;
 out: