summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAlex Elder <elder@dreamhost.com>2012-01-11 17:41:01 -0800
committerSage Weil <sage@newdream.net>2012-02-02 12:48:52 -0800
commit114fc47492e23d93653e4a16664833e98d62a563 (patch)
treec5ff822c89193cc6cad952cf24a06cd4a1f706eb /fs
parent805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff)
downloadlinux-114fc47492e23d93653e4a16664833e98d62a563.tar.gz
linux-114fc47492e23d93653e4a16664833e98d62a563.tar.bz2
linux-114fc47492e23d93653e4a16664833e98d62a563.zip
ceph: change "ceph.layout" xattr to be "ceph.file.layout"
The virtual extended attribute named "ceph.layout" is meaningful only for regular files. Change its name to be "ceph.file.layout" to more directly reflect that in the ceph xattr namespace. Preserve the old "ceph.layout" name for the time being (until we decide it's safe to get rid of it entirely). Add a missing initializer for "readonly" in the terminating entry. Signed-off-by: Alex Elder <elder@dreamhost.com> Reviewed-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/xattr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index a5e36e4488a7..9e6734e38c12 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -111,8 +111,10 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,
}
static struct ceph_vxattr_cb ceph_file_vxattrs[] = {
+ { true, "ceph.file.layout", ceph_vxattrcb_layout},
+ /* The following extended attribute name is deprecated */
{ true, "ceph.layout", ceph_vxattrcb_layout},
- { NULL, NULL }
+ { true, NULL, NULL }
};
static struct ceph_vxattr_cb *ceph_inode_vxattrs(struct inode *inode)