UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Alex Elder 2012-01-23 15:49:28 -06:00
parent 2289190719
commit eb78808446
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fs/ceph/xattr.c
View File

@ -25,10 +25,10 @@ static bool ceph_is_valid_xattr(const char *name)
* statistics and layout metadata. * statistics and layout metadata.
*/ */
struct ceph_vxattr_cb { struct ceph_vxattr_cb {
bool readonly;
char *name; char *name;
size_t (*getxattr_cb)(struct ceph_inode_info *ci, char *val, size_t (*getxattr_cb)(struct ceph_inode_info *ci, char *val,
size_t size); size_t size);
bool readonly;
}; };
/* directories */ /* directories */
@ -82,16 +82,25 @@ static size_t ceph_vxattrcb_rctime(struct ceph_inode_info *ci, char *val,
(long)ci->i_rctime.tv_nsec); (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[] = { static struct ceph_vxattr_cb ceph_dir_vxattrs[] = {
{ true, XATTR_CEPH_PREFIX "dir.entries", ceph_vxattrcb_entries}, XATTR_NAME_CEPH(dir, entries),
{ true, XATTR_CEPH_PREFIX "dir.files", ceph_vxattrcb_files}, XATTR_NAME_CEPH(dir, files),
{ true, XATTR_CEPH_PREFIX "dir.subdirs", ceph_vxattrcb_subdirs}, XATTR_NAME_CEPH(dir, subdirs),
{ true, XATTR_CEPH_PREFIX "dir.rentries", ceph_vxattrcb_rentries}, XATTR_NAME_CEPH(dir, rentries),
{ true, XATTR_CEPH_PREFIX "dir.rfiles", ceph_vxattrcb_rfiles}, XATTR_NAME_CEPH(dir, rfiles),
{ true, XATTR_CEPH_PREFIX "dir.rsubdirs", ceph_vxattrcb_rsubdirs}, XATTR_NAME_CEPH(dir, rsubdirs),
{ true, XATTR_CEPH_PREFIX "dir.rbytes", ceph_vxattrcb_rbytes}, XATTR_NAME_CEPH(dir, rbytes),
{ true, XATTR_CEPH_PREFIX "dir.rctime", ceph_vxattrcb_rctime}, XATTR_NAME_CEPH(dir, rctime),
{ true, NULL, NULL } { 0 } /* Required table terminator */
}; };
/* files */ /* 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[] = { 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 */ /* 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) static struct ceph_vxattr_cb *ceph_inode_vxattrs(struct inode *inode)