diff --git a/[refs] b/[refs]
index 4b6b8ce0840d..e47184ffee8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76fea00a0522185658b733d441d6ec049344456b
+refs/heads/master: 7a7205367dfd9adf129f0ebc7d040a557fe0d1ba
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 06d92be16805..41b0c7de7a59 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -857,7 +857,7 @@ static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry,
 	path = btrfs_alloc_path();
 	BUG_ON(!path);
 
-	if (namelen == 1 && strcmp(name, "..") == 0) {
+	if (namelen == 2 && strcmp(name, "..") == 0) {
 		struct btrfs_key key;
 		struct extent_buffer *leaf;
 		u32 nritems;