diff --git a/[refs] b/[refs]
index 1f2826a0fced..2126b72ec3a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1caf9342fc71d020e788a59598a44d4ea0136b36
+refs/heads/master: 3acd7ee876c508973eb4722de5b00b3dff4c7372
diff --git a/trunk/fs/btrfs/xattr.c b/trunk/fs/btrfs/xattr.c
index 984616cca254..33caaf5b4b0c 100644
--- a/trunk/fs/btrfs/xattr.c
+++ b/trunk/fs/btrfs/xattr.c
@@ -180,7 +180,7 @@ ssize_t btrfs_xattr_get(struct inode *inode, int name_index,
 	data_ptr = (unsigned long)((char *)(di + 1) +
 				   btrfs_dir_name_len(leaf, di));
 	read_extent_buffer(leaf, buffer, data_ptr,
-			   btrfs_dir_name_len(leaf, di));
+			   btrfs_dir_data_len(leaf, di));
 	ret = btrfs_dir_data_len(leaf, di);
 
 out:
@@ -490,7 +490,7 @@ struct xattr_handler btrfs_xattr_user_handler = {
 };
 
 struct xattr_handler btrfs_xattr_trusted_handler = {
-	.prefix = XATTR_USER_PREFIX,
+	.prefix = XATTR_TRUSTED_PREFIX,
 	.list	= btrfs_xattr_generic_list,
 	.get	= btrfs_xattr_trusted_get,
 	.set	= btrfs_xattr_trusted_set,