diff --git a/[refs] b/[refs]
index 94c0b1f09aef..3a68d5bd3b85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 969e5aa3b0162a02c4f287d48ff58ca2145acf1b
+refs/heads/master: 39b648d9ec7d4ab0b4362872c6284a12c582afa6
diff --git a/trunk/fs/ceph/xattr.c b/trunk/fs/ceph/xattr.c
index 2c2ae5be9902..c2048b1a5395 100644
--- a/trunk/fs/ceph/xattr.c
+++ b/trunk/fs/ceph/xattr.c
@@ -123,13 +123,6 @@ static size_t ceph_vxattrcb_file_layout(struct ceph_inode_info *ci, char *val,
 
 static struct ceph_vxattr ceph_file_vxattrs[] = {
 	XATTR_NAME_CEPH(file, layout),
-	/* The following extended attribute name is deprecated */
-	{
-		.name = XATTR_CEPH_PREFIX "layout",
-		.name_size = sizeof (XATTR_CEPH_PREFIX "layout"),
-		.getxattr_cb = ceph_vxattrcb_file_layout,
-		.readonly = true,
-	},
 	{ 0 }	/* Required table terminator */
 };
 static size_t ceph_file_vxattrs_name_size;	/* total size of all names */