summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAlex Elder <elder@dreamhost.com>2012-01-23 15:49:28 -0600
committerAlex Elder <elder@dreamhost.com>2012-03-22 10:47:46 -0500
commiteb78808446aeed8e25b080c66bf823c1f188236d (patch)
treed6d907a1028ead5286721f7d165c8cd20a6f4632 /fs
parent22891907193e005923a14384d82d702f6af4f0cf (diff)
ceph: use macros to normalize vxattr table definitions
Entries in the ceph virtual extended attribute tables all follow a distinct pattern in their definition. Enforce this pattern through the use of a macro. Also, a null name field signals the end of the table, so make that be the first field in the ceph_vxattr_cb structure. Signed-off-by: Alex Elder <elder@dreamhost.com> Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/xattr.c39
1 files changed, 26 insertions, 13 deletions
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 05bb56f402a..38aef476f78 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -25,10 +25,10 @@ static bool ceph_is_valid_xattr(const char *name)
* statistics and layout metadata.
*/
struct ceph_vxattr_cb {
- bool readonly;
char *name;
size_t (*getxattr_cb)(struct ceph_inode_info *ci, char *val,
size_t size);
+ bool readonly;
};
/* directories */
@@ -82,16 +82,25 @@ static size_t ceph_vxattrcb_rctime(struct ceph_inode_info *ci, char *val,
(long)ci->i_rctime.tv_nsec);
}
+#define CEPH_XATTR_NAME(_type, _name) XATTR_CEPH_PREFIX #_type "." #_name
+
+#define XATTR_NAME_CEPH(_type, _name) \
+ { \
+ .name = CEPH_XATTR_NAME(_type, _name), \
+ .getxattr_cb = ceph_vxattrcb_ ## _name, \
+ .readonly = true, \
+ }
+
static struct ceph_vxattr_cb ceph_dir_vxattrs[] = {
- { true, XATTR_CEPH_PREFIX "dir.entries", ceph_vxattrcb_entries},
- { true, XATTR_CEPH_PREFIX "dir.files", ceph_vxattrcb_files},
- { true, XATTR_CEPH_PREFIX "dir.subdirs", ceph_vxattrcb_subdirs},
- { true, XATTR_CEPH_PREFIX "dir.rentries", ceph_vxattrcb_rentries},
- { true, XATTR_CEPH_PREFIX "dir.rfiles", ceph_vxattrcb_rfiles},
- { true, XATTR_CEPH_PREFIX "dir.rsubdirs", ceph_vxattrcb_rsubdirs},
- { true, XATTR_CEPH_PREFIX "dir.rbytes", ceph_vxattrcb_rbytes},
- { true, XATTR_CEPH_PREFIX "dir.rctime", ceph_vxattrcb_rctime},
- { true, NULL, NULL }
+ XATTR_NAME_CEPH(dir, entries),
+ XATTR_NAME_CEPH(dir, files),
+ XATTR_NAME_CEPH(dir, subdirs),
+ XATTR_NAME_CEPH(dir, rentries),
+ XATTR_NAME_CEPH(dir, rfiles),
+ XATTR_NAME_CEPH(dir, rsubdirs),
+ XATTR_NAME_CEPH(dir, rbytes),
+ XATTR_NAME_CEPH(dir, rctime),
+ { 0 } /* Required table terminator */
};
/* files */
@@ -114,10 +123,14 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,
}
static struct ceph_vxattr_cb ceph_file_vxattrs[] = {
- { true, XATTR_CEPH_PREFIX "file.layout", ceph_vxattrcb_layout},
+ XATTR_NAME_CEPH(file, layout),
/* The following extended attribute name is deprecated */
- { true, XATTR_CEPH_PREFIX "layout", ceph_vxattrcb_layout},
- { true, NULL, NULL }
+ {
+ .name = XATTR_CEPH_PREFIX "layout",
+ .getxattr_cb = ceph_vxattrcb_layout,
+ .readonly = true,
+ },
+ { 0 } /* Required table terminator */
};
static struct ceph_vxattr_cb *ceph_inode_vxattrs(struct inode *inode)