hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph: support getting ceph.dir.pin vxattr 

Link: http://tracker.ceph.com/issues/37576
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Yan, Zheng 2019-01-09 11:07:02 +08:00 committed by Ilya Dryomov
parent b37fe1f923
commit 08796873a5
5 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/ceph/inode.c
View File

@ -877,6 +877,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page,
ci->i_rbytes = le64_to_cpu(info->rbytes); ci->i_rbytes = le64_to_cpu(info->rbytes);
ci->i_rfiles = le64_to_cpu(info->rfiles); ci->i_rfiles = le64_to_cpu(info->rfiles);
ci->i_rsubdirs = le64_to_cpu(info->rsubdirs); ci->i_rsubdirs = le64_to_cpu(info->rsubdirs);
ci->i_dir_pin = iinfo->dir_pin;
ceph_decode_timespec64(&ci->i_rctime, &info->rctime); ceph_decode_timespec64(&ci->i_rctime, &info->rctime);
} }
} }

9
fs/ceph/mds_client.c
View File

@ -157,6 +157,13 @@ static int parse_reply_info_in(void **p, void *end,
ceph_decode_64_safe(p, end, change_attr, bad); ceph_decode_64_safe(p, end, change_attr, bad);
} }
/* dir pin */
if (struct_v >= 2) {
ceph_decode_32_safe(p, end, info->dir_pin, bad);
} else {
info->dir_pin = -ENODATA;
}
*p = end; *p = end;
} else { } else {
if (features & CEPH_FEATURE_MDS_INLINE_DATA) { if (features & CEPH_FEATURE_MDS_INLINE_DATA) {
@ -187,6 +194,8 @@ static int parse_reply_info_in(void **p, void *end,
*p += info->pool_ns_len; *p += info->pool_ns_len;
} }
} }
info->dir_pin = -ENODATA;
} }
return 0; return 0;
bad: bad:

1
fs/ceph/mds_client.h
View File

@ -68,6 +68,7 @@ struct ceph_mds_reply_info_in {
char *pool_ns_data; char *pool_ns_data;
u64 max_bytes; u64 max_bytes;
u64 max_files; u64 max_files;
s32 dir_pin;
}; };
struct ceph_mds_reply_dir_entry { struct ceph_mds_reply_dir_entry {

2
fs/ceph/super.h
View File

@ -318,6 +318,8 @@ struct ceph_inode_info {
/* quotas */ /* quotas */
u64 i_max_bytes, i_max_files; u64 i_max_bytes, i_max_files;
s32 i_dir_pin;
struct rb_root i_fragtree; struct rb_root i_fragtree;
int i_fragtree_nsplits; int i_fragtree_nsplits;
struct mutex i_fragtree_mutex; struct mutex i_fragtree_mutex;

20
fs/ceph/xattr.c
View File

@ -228,8 +228,19 @@ static size_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val,
ci->i_rctime.tv_nsec); ci->i_rctime.tv_nsec);
} }
/* quotas */ /* dir pin */
static bool ceph_vxattrcb_dir_pin_exists(struct ceph_inode_info *ci)
{
return ci->i_dir_pin != -ENODATA;
}
static size_t ceph_vxattrcb_dir_pin(struct ceph_inode_info *ci, char *val,
size_t size)
{
return snprintf(val, size, "%d", (int)ci->i_dir_pin);
}
/* quotas */
static bool ceph_vxattrcb_quota_exists(struct ceph_inode_info *ci) static bool ceph_vxattrcb_quota_exists(struct ceph_inode_info *ci)
{ {
bool ret = false; bool ret = false;
@ -314,6 +325,13 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {
XATTR_RSTAT_FIELD(dir, rsubdirs), XATTR_RSTAT_FIELD(dir, rsubdirs),
XATTR_RSTAT_FIELD(dir, rbytes), XATTR_RSTAT_FIELD(dir, rbytes),
XATTR_RSTAT_FIELD(dir, rctime), XATTR_RSTAT_FIELD(dir, rctime),
{
.name = "ceph.dir.pin",
.name_size = sizeof("ceph.dir_pin"),
.getxattr_cb = ceph_vxattrcb_dir_pin,
.exists_cb = ceph_vxattrcb_dir_pin_exists,
.flags = VXATTR_FLAG_HIDDEN,
},
{ {
.name = "ceph.quota", .name = "ceph.quota",
.name_size = sizeof("ceph.quota"), .name_size = sizeof("ceph.quota"),