diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-01 09:26:41 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-01 09:26:43 (GMT) |
| commit | 7e4d960993331e92567f0180e45322a93e6780ba (patch) | |
| tree | 4d7444035303fc0b545e88afbd894176344fb2a3 /fs/ceph/xattr.c | |
| parent | de5bdff7a72acc281219be2b8edeeca1fd81c542 (diff) | |
| parent | 164974a8f2a482f1abcb027c6d1a89dd79b14297 (diff) | |
| download | linux-fsl-qoriq-7e4d960993331e92567f0180e45322a93e6780ba.tar.xz | |
Merge branch 'linus' into sched/core
Merge reason: we'll queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ceph/xattr.c')
| -rw-r--r-- | fs/ceph/xattr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c index 857214a..a76f697 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) |