ceph: support getting ceph.dir.rsnaps vxattr
PATCH v2 1/1 ceph: support getting ceph.dir.rsnaps vxattr
It's easy to know how many snapshots have been created.
--- fs/ceph/inode.c | 1 + fs/ceph/mds_client.c | 9 ++++++++- fs/ceph/mds_client.h | 1 + fs/ceph/super.h | 2 +- fs/ceph/xattr.c | 7 +++++++ 5 files changed, 18 insertions(+), 2 deletions(-)
fs/ceph/inode.c +1 -0
@@ -891,6 +891,7 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page, ci->i_rfiles =le64_to_cpu (info->rfiles); ci->i_rsubdirs =le64_to_cpu (info->rsubdirs); ci->i_dir_pin = iinfo->dir_pin; + ci->i_rsnaps = iinfo->rsnaps;ceph_decode_timespec64 (&ci->i_rctime, &info->rctime); } }
fs/ceph/mds_client.c +8 -1
@@ -176,6 +176,13 @@ static int parse_reply_info_in(void **p, void *end,memset (&info->snap_btime,0 ,sizeof (info->snap_btime)); } +/* snapshot count, remains zero for v<=3 */ +if (struct_v >=4 ) { +ceph_decode_64_safe (p, end, info->rsnaps, bad); + }else { + info->rsnaps =0 ; + } + *p = end; }else {if (features &CEPH_FEATURE_MDS_INLINE_DATA ) {
@@ -214,7 +221,7 @@ static int parse_reply_info_in(void **p, void *end, } info->dir_pin = -ENODATA ; -/* info->snap_btime remains zero */ +/* info->snap_btime and info->rsnaps remain zero */ }return 0 ; bad:
fs/ceph/mds_client.h +1 -0
@@ -88,6 +88,7 @@ struct ceph_mds_reply_info_in {s32 dir_pin;struct ceph_timespec btime;struct ceph_timespec snap_btime; +u64 rsnaps;u64 change_attr; };
fs/ceph/super.h +1 -1
@@ -332,7 +332,7 @@ struct ceph_inode_info {/* for dirs */ struct timespec64 i_rctime; -u64 i_rbytes, i_rfiles, i_rsubdirs; +u64 i_rbytes, i_rfiles, i_rsubdirs, i_rsnaps;u64 i_files, i_subdirs;/* quotas */
fs/ceph/xattr.c +7 -0
@@ -231,6 +231,12 @@ static ssize_t ceph_vxattrcb_dir_rsubdirs(struct ceph_inode_info *ci, char *val,return ceph_fmt_xattr (val, size,"%lld" , ci->i_rsubdirs); } +static ssize_t ceph_vxattrcb_dir_rsnaps (struct ceph_inode_info *ci,char *val, +size_t size) +{ +return ceph_fmt_xattr (val, size,"%lld" , ci->i_rsnaps); +} +static ssize_t ceph_vxattrcb_dir_rbytes (struct ceph_inode_info *ci,char *val,size_t size) {
@@ -352,6 +358,7 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {XATTR_RSTAT_FIELD (dir, rentries),XATTR_RSTAT_FIELD (dir, rfiles),XATTR_RSTAT_FIELD (dir, rsubdirs), +XATTR_RSTAT_FIELD (dir, rsnaps),XATTR_RSTAT_FIELD (dir, rbytes), XATTR_RSTAT_FIELD(dir, rctime), {
Signature · 1 line
2.24.3 (Apple Git-128)
ping @jeff @Ilya
Quoted 105 lines · Yanhu Cao
It's easy to know how many snapshots have been created.
Signed-off-by Yanhu Cao <[email protected]>--- fs/ceph/inode.c | 1 + fs/ceph/mds_client.c | 9 ++++++++- fs/ceph/mds_client.h | 1 + fs/ceph/super.h | 2 +- fs/ceph/xattr.c | 7 +++++++ 5 files changed, 18 insertions(+), 2 deletions(-)fs/ceph/inode.c +1
-0@@ -891,6 +891,7 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page, ci->i_rfiles =le64_to_cpu (info->rfiles); ci->i_rsubdirs =le64_to_cpu (info->rsubdirs); ci->i_dir_pin = iinfo->dir_pin; + ci->i_rsnaps = iinfo->rsnaps;ceph_decode_timespec64 (&ci->i_rctime, &info->rctime); } }fs/ceph/mds_client.c +8
-1@@ -176,6 +176,13 @@ static int parse_reply_info_in(void **p, void *end,memset (&info->snap_btime,0 ,sizeof (info->snap_btime)); } +/* snapshot count, remains zero for v<=3 */ +if (struct_v >=4 ) { +ceph_decode_64_safe (p, end, info->rsnaps, bad); + }else { + info->rsnaps =0 ; + } + *p = end; }else {if (features &CEPH_FEATURE_MDS_INLINE_DATA ) {@@ -214,7 +221,7 @@ static int parse_reply_info_in(void **p, void *end, } info->dir_pin = -ENODATA ; -/* info->snap_btime remains zero */ +/* info->snap_btime and info->rsnaps remain zero */ }return 0 ; bad:fs/ceph/mds_client.h +1
-0@@ -88,6 +88,7 @@ struct ceph_mds_reply_info_in {s32 dir_pin;struct ceph_timespec btime;struct ceph_timespec snap_btime; +u64 rsnaps;u64 change_attr; };fs/ceph/super.h +1
-1@@ -332,7 +332,7 @@ struct ceph_inode_info {/* for dirs */ struct timespec64 i_rctime; -u64 i_rbytes, i_rfiles, i_rsubdirs; +u64 i_rbytes, i_rfiles, i_rsubdirs, i_rsnaps;u64 i_files, i_subdirs;/* quotas */ fs/ceph/xattr.c +7
-1@@ -231,6 +231,12 @@ static ssize_t ceph_vxattrcb_dir_rsubdirs(struct ceph_inode_info *ci, char *val,return ceph_fmt_xattr (val, size,"%lld" , ci->i_rsubdirs); } +static ssize_t ceph_vxattrcb_dir_rsnaps (struct ceph_inode_info *ci,char *val, +size_t size) +{ +return ceph_fmt_xattr (val, size,"%lld" , ci->i_rsnaps); +} +static ssize_t ceph_vxattrcb_dir_rbytes (struct ceph_inode_info *ci,char *val,size_t size) {@@ -352,6 +358,7 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {XATTR_RSTAT_FIELD (dir, rentries),XATTR_RSTAT_FIELD (dir, rfiles),XATTR_RSTAT_FIELD (dir, rsubdirs), +XATTR_RSTAT_FIELD (dir, rsnaps),XATTR_RSTAT_FIELD (dir, rbytes), XATTR_RSTAT_FIELD(dir, rctime), { --2.24.3 (Apple Git-128)
Quoted 94 lines · Yanhu Cao
It's easy to know how many snapshots have been created.
Signed-off-by Yanhu Cao <[email protected]>--- fs/ceph/inode.c | 1 + fs/ceph/mds_client.c | 9 ++++++++- fs/ceph/mds_client.h | 1 + fs/ceph/super.h | 2 +- fs/ceph/xattr.c | 7 +++++++ 5 files changed, 18 insertions(+), 2 deletions(-)fs/ceph/inode.c +1
-0@@ -891,6 +891,7 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page, ci->i_rfiles =le64_to_cpu (info->rfiles); ci->i_rsubdirs =le64_to_cpu (info->rsubdirs); ci->i_dir_pin = iinfo->dir_pin; + ci->i_rsnaps = iinfo->rsnaps;ceph_decode_timespec64 (&ci->i_rctime, &info->rctime); } }fs/ceph/mds_client.c +8
-1@@ -176,6 +176,13 @@ static int parse_reply_info_in(void **p, void *end,memset (&info->snap_btime,0 ,sizeof (info->snap_btime)); } +/* snapshot count, remains zero for v<=3 */ +if (struct_v >=4 ) { +ceph_decode_64_safe (p, end, info->rsnaps, bad); + }else { + info->rsnaps =0 ; + } + *p = end; }else {if (features &CEPH_FEATURE_MDS_INLINE_DATA ) {@@ -214,7 +221,7 @@ static int parse_reply_info_in(void **p, void *end, } info->dir_pin = -ENODATA ; -/* info->snap_btime remains zero */ +/* info->snap_btime and info->rsnaps remain zero */ }return 0 ; bad:fs/ceph/mds_client.h +1
-0@@ -88,6 +88,7 @@ struct ceph_mds_reply_info_in {s32 dir_pin;struct ceph_timespec btime;struct ceph_timespec snap_btime; +u64 rsnaps;u64 change_attr; };fs/ceph/super.h +1
-1@@ -332,7 +332,7 @@ struct ceph_inode_info {/* for dirs */ struct timespec64 i_rctime; -u64 i_rbytes, i_rfiles, i_rsubdirs; +u64 i_rbytes, i_rfiles, i_rsubdirs, i_rsnaps;u64 i_files, i_subdirs;/* quotas */ fs/ceph/xattr.c +6
-0@@ -231,6 +231,12 @@ static ssize_t ceph_vxattrcb_dir_rsubdirs(struct ceph_inode_info *ci, char *val,return ceph_fmt_xattr (val, size,"%lld" , ci->i_rsubdirs); } +static ssize_t ceph_vxattrcb_dir_rsnaps (struct ceph_inode_info *ci,char *val, +size_t size) +{ +return ceph_fmt_xattr (val, size,"%lld" , ci->i_rsnaps); +} +static ssize_t ceph_vxattrcb_dir_rbytes (struct ceph_inode_info *ci,char *val,size_t size) {
fs/ceph/xattr.c static struct ceph_vxattr ceph_dir_vxattrs[] = { · line 364
Quoted 7 lines
fs/ceph/xattr.c +1
-0@@ -352,6 +358,7 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {XATTR_RSTAT_FIELD (dir, rentries),XATTR_RSTAT_FIELD (dir, rfiles),XATTR_RSTAT_FIELD (dir, rsubdirs), +XATTR_RSTAT_FIELD (dir, rsnaps),XATTR_RSTAT_FIELD (dir, rbytes), XATTR_RSTAT_FIELD(dir, rctime), {
Sorry we missed this one Yanhu. In the future, please put [PATCH] in the subject line in some fashion and we may spot it more easily.
This looks fine to me -- merged into ceph-client/testing branch, though I did revise the changelog to be a bit more descriptive. Tell me if you think it needs changes.
Thanks!
Signature · 1 line
Jeff Layton <[email protected]>
Quoted 98 lines · Jeff Layton
Quoted 96 lines · Yanhu Cao
It's easy to know how many snapshots have been created.
Signed-off-by Yanhu Cao <[email protected]>--- fs/ceph/inode.c | 1 + fs/ceph/mds_client.c | 9 ++++++++- fs/ceph/mds_client.h | 1 + fs/ceph/super.h | 2 +- fs/ceph/xattr.c | 7 +++++++ 5 files changed, 18 insertions(+), 2 deletions(-)fs/ceph/inode.c +1
-0@@ -891,6 +891,7 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page, ci->i_rfiles =le64_to_cpu (info->rfiles); ci->i_rsubdirs =le64_to_cpu (info->rsubdirs); ci->i_dir_pin = iinfo->dir_pin; + ci->i_rsnaps = iinfo->rsnaps;ceph_decode_timespec64 (&ci->i_rctime, &info->rctime); } }fs/ceph/mds_client.c +8
-1@@ -176,6 +176,13 @@ static int parse_reply_info_in(void **p, void *end,memset (&info->snap_btime,0 ,sizeof (info->snap_btime)); } +/* snapshot count, remains zero for v<=3 */ +if (struct_v >=4 ) { +ceph_decode_64_safe (p, end, info->rsnaps, bad); + }else { + info->rsnaps =0 ; + } + *p = end; }else {if (features &CEPH_FEATURE_MDS_INLINE_DATA ) {@@ -214,7 +221,7 @@ static int parse_reply_info_in(void **p, void *end, } info->dir_pin = -ENODATA ; -/* info->snap_btime remains zero */ +/* info->snap_btime and info->rsnaps remain zero */ }return 0 ; bad:fs/ceph/mds_client.h +1
-0@@ -88,6 +88,7 @@ struct ceph_mds_reply_info_in {s32 dir_pin;struct ceph_timespec btime;struct ceph_timespec snap_btime; +u64 rsnaps;u64 change_attr; };fs/ceph/super.h +1
-1@@ -332,7 +332,7 @@ struct ceph_inode_info {/* for dirs */ struct timespec64 i_rctime; -u64 i_rbytes, i_rfiles, i_rsubdirs; +u64 i_rbytes, i_rfiles, i_rsubdirs, i_rsnaps;u64 i_files, i_subdirs;/* quotas */ fs/ceph/xattr.c +6
-0@@ -231,6 +231,12 @@ static ssize_t ceph_vxattrcb_dir_rsubdirs(struct ceph_inode_info *ci, char *val,return ceph_fmt_xattr (val, size,"%lld" , ci->i_rsubdirs); } +static ssize_t ceph_vxattrcb_dir_rsnaps (struct ceph_inode_info *ci,char *val, +size_t size) +{ +return ceph_fmt_xattr (val, size,"%lld" , ci->i_rsnaps); +} +static ssize_t ceph_vxattrcb_dir_rbytes (struct ceph_inode_info *ci,char *val,size_t size) {@@ -352,6 +358,7 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {XATTR_RSTAT_FIELD (dir, rentries), XATTR_RSTAT_FIELD(dir, rfiles),
Quoted 8 lines
fs/ceph/xattr.c static struct ceph_vxattr ceph_dir_vxattrs[] = { · line 364
Quoted 5 lines
fs/ceph/xattr.c +1
-0XATTR_RSTAT_FIELD (dir, rsubdirs), +XATTR_RSTAT_FIELD (dir, rsnaps),XATTR_RSTAT_FIELD (dir, rbytes), XATTR_RSTAT_FIELD(dir, rctime), {Sorry we missed this one Yanhu. In the future, please put [PATCH] in the subject line in some fashion and we may spot it more easily.
OK. will do.
Quoted 4 lines
This looks fine to me -- merged into ceph-client/testing branch, though I did revise the changelog to be a bit more descriptive. Tell me if you think it needs changes.
LGTM.
Quoted 5 lines
Thanks!
--
Jeff Layton <[email protected]>