* [RFC 1/2] ceph: introduce 'ceph.all' virtual xattr
@ 2016-07-21 6:49 Venky Shankar
2016-07-21 6:49 ` [RFC 2/2] ceph: do not return virtual xattrs in listxattr() Venky Shankar
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Venky Shankar @ 2016-07-21 6:49 UTC (permalink / raw)
To: ceph-devel; +Cc: zyan
As of now listing extended attributes result in ceph dump all of
it's internal xattrs thereby confusing tools such as rsync and the
likes. This functionality would be removed in the subsequent patch,
but there needs to be a way to examine ceph's internal xattr.
Remembering all internal xattrs is cumbersome and error prone, so,
we provide a virtual xattr to fetch a list of ceph's internal xattr,
obviously excluding itself.
Signed-off-by: Venky Shankar <vshankar@redhat.com>
---
fs/ceph/xattr.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 4870b29..d0f59cb 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -204,7 +204,45 @@ static size_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val,
(long)ci->i_rctime.tv_nsec);
}
+static struct ceph_vxattr *ceph_inode_vxattrs(struct inode *inode);
+static size_t ceph_vxattrs_name_size(struct ceph_vxattr *vxattrs);
+/* list all ceph internal xattrs */
+static size_t ceph_vxattrcb_list_all(struct ceph_inode_info *ci, char *val,
+ size_t size)
+{
+ struct inode *inode = &ci->vfs_inode;
+ struct ceph_vxattr *vxattr;
+ struct ceph_vxattr *vxattrs = ceph_inode_vxattrs(inode);
+ u32 len, namelen;
+ int err = 0;
+
+ if (!vxattrs)
+ goto out;
+
+ namelen = ceph_vxattrs_name_size(vxattrs);
+
+ err = -ERANGE;
+ if (size && (namelen > size))
+ goto out;
+ err = namelen;
+ if (size == 0)
+ goto out;
+
+ /* fill up buffer with virtual xattrs */
+ for (err = 0, vxattr = vxattrs; vxattr->name; vxattr++) {
+ if (!vxattr->hidden && !(vxattr->exists_cb
+ && !vxattr->exists_cb(ci))) {
+ len = snprintf(val + err, size - err, "%s", vxattr->name);
+ err += len + 1;
+ }
+ }
+
+ out:
+ return err;
+}
+
+#define CEPH_XATTR_LIST_INTERNAL XATTR_CEPH_PREFIX"all"
#define CEPH_XATTR_NAME(_type, _name) XATTR_CEPH_PREFIX #_type "." #_name
#define CEPH_XATTR_NAME2(_type, _name, _name2) \
XATTR_CEPH_PREFIX #_type "." #_name "." #_name2
@@ -237,6 +275,14 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {
.hidden = true,
.exists_cb = ceph_vxattrcb_layout_exists,
},
+ {
+ .name = CEPH_XATTR_LIST_INTERNAL,
+ .name_size = sizeof(CEPH_XATTR_LIST_INTERNAL),
+ .getxattr_cb = ceph_vxattrcb_list_all,
+ .readonly = true,
+ .hidden = true,
+ .exists_cb = NULL,
+ },
XATTR_LAYOUT_FIELD(dir, layout, stripe_unit),
XATTR_LAYOUT_FIELD(dir, layout, stripe_count),
XATTR_LAYOUT_FIELD(dir, layout, object_size),
@@ -264,6 +310,14 @@ static struct ceph_vxattr ceph_file_vxattrs[] = {
.hidden = true,
.exists_cb = ceph_vxattrcb_layout_exists,
},
+ {
+ .name = CEPH_XATTR_LIST_INTERNAL,
+ .name_size = sizeof(CEPH_XATTR_LIST_INTERNAL),
+ .getxattr_cb = ceph_vxattrcb_list_all,
+ .readonly = true,
+ .hidden = true,
+ .exists_cb = NULL,
+ },
XATTR_LAYOUT_FIELD(file, layout, stripe_unit),
XATTR_LAYOUT_FIELD(file, layout, stripe_count),
XATTR_LAYOUT_FIELD(file, layout, object_size),
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [RFC 2/2] ceph: do not return virtual xattrs in listxattr()
2016-07-21 6:49 [RFC 1/2] ceph: introduce 'ceph.all' virtual xattr Venky Shankar
@ 2016-07-21 6:49 ` Venky Shankar
2016-07-21 7:30 ` [RFC 1/2] ceph: introduce 'ceph.all' virtual xattr Yan, Zheng
2016-07-21 12:17 ` [PATCH 0/2] ceph: virtual xattr handling Venky Shankar
2 siblings, 0 replies; 9+ messages in thread
From: Venky Shankar @ 2016-07-21 6:49 UTC (permalink / raw)
To: ceph-devel; +Cc: zyan
Signed-off-by: Venky Shankar <vshankar@redhat.com>
---
fs/ceph/xattr.c | 27 ++-------------------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index d0f59cb..3b227aa 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -848,12 +848,8 @@ ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size)
{
struct inode *inode = d_inode(dentry);
struct ceph_inode_info *ci = ceph_inode(inode);
- struct ceph_vxattr *vxattrs = ceph_inode_vxattrs(inode);
- u32 vir_namelen = 0;
u32 namelen;
int err;
- u32 len;
- int i;
spin_lock(&ci->i_ceph_lock);
dout("listxattr %p ver=%lld index_ver=%lld\n", inode,
@@ -871,38 +867,19 @@ ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size)
err = __build_xattrs(inode);
if (err < 0)
goto out;
- /*
- * Start with virtual dir xattr names (if any) (including
- * terminating '\0' characters for each).
- */
- vir_namelen = ceph_vxattrs_name_size(vxattrs);
/* adding 1 byte per each variable due to the null termination */
namelen = ci->i_xattrs.names_size + ci->i_xattrs.count;
err = -ERANGE;
- if (size && vir_namelen + namelen > size)
+ if (size && namelen > size)
goto out;
- err = namelen + vir_namelen;
+ err = namelen;
if (size == 0)
goto out;
names = __copy_xattr_names(ci, names);
- /* virtual xattr names, too */
- err = namelen;
- if (vxattrs) {
- for (i = 0; vxattrs[i].name; i++) {
- if (!vxattrs[i].hidden &&
- !(vxattrs[i].exists_cb &&
- !vxattrs[i].exists_cb(ci))) {
- len = sprintf(names, "%s", vxattrs[i].name);
- names += len + 1;
- err += len + 1;
- }
- }
- }
-
out:
spin_unlock(&ci->i_ceph_lock);
return err;
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [RFC 1/2] ceph: introduce 'ceph.all' virtual xattr
2016-07-21 6:49 [RFC 1/2] ceph: introduce 'ceph.all' virtual xattr Venky Shankar
2016-07-21 6:49 ` [RFC 2/2] ceph: do not return virtual xattrs in listxattr() Venky Shankar
@ 2016-07-21 7:30 ` Yan, Zheng
2016-07-21 12:17 ` [PATCH 0/2] ceph: virtual xattr handling Venky Shankar
2 siblings, 0 replies; 9+ messages in thread
From: Yan, Zheng @ 2016-07-21 7:30 UTC (permalink / raw)
To: Venky Shankar; +Cc: ceph-devel, Zheng Yan
On Thu, Jul 21, 2016 at 2:49 PM, Venky Shankar <vshankar@redhat.com> wrote:
> As of now listing extended attributes result in ceph dump all of
> it's internal xattrs thereby confusing tools such as rsync and the
> likes. This functionality would be removed in the subsequent patch,
> but there needs to be a way to examine ceph's internal xattr.
>
> Remembering all internal xattrs is cumbersome and error prone, so,
> we provide a virtual xattr to fetch a list of ceph's internal xattr,
> obviously excluding itself.
>
> Signed-off-by: Venky Shankar <vshankar@redhat.com>
> ---
> fs/ceph/xattr.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 54 insertions(+)
>
> diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
> index 4870b29..d0f59cb 100644
> --- a/fs/ceph/xattr.c
> +++ b/fs/ceph/xattr.c
> @@ -204,7 +204,45 @@ static size_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val,
> (long)ci->i_rctime.tv_nsec);
> }
>
> +static struct ceph_vxattr *ceph_inode_vxattrs(struct inode *inode);
> +static size_t ceph_vxattrs_name_size(struct ceph_vxattr *vxattrs);
>
> +/* list all ceph internal xattrs */
> +static size_t ceph_vxattrcb_list_all(struct ceph_inode_info *ci, char *val,
> + size_t size)
> +{
> + struct inode *inode = &ci->vfs_inode;
> + struct ceph_vxattr *vxattr;
> + struct ceph_vxattr *vxattrs = ceph_inode_vxattrs(inode);
> + u32 len, namelen;
> + int err = 0;
> +
> + if (!vxattrs)
> + goto out;
> +
> + namelen = ceph_vxattrs_name_size(vxattrs);
> +
> + err = -ERANGE;
> + if (size && (namelen > size))
> + goto out;
> + err = namelen;
> + if (size == 0)
> + goto out;
> +
> + /* fill up buffer with virtual xattrs */
> + for (err = 0, vxattr = vxattrs; vxattr->name; vxattr++) {
> + if (!vxattr->hidden && !(vxattr->exists_cb
> + && !vxattr->exists_cb(ci))) {
> + len = snprintf(val + err, size - err, "%s", vxattr->name);
> + err += len + 1;
> + }
> + }
> +
> + out:
> + return err;
> +}
> +
> +#define CEPH_XATTR_LIST_INTERNAL XATTR_CEPH_PREFIX"all"
I prefer name ceph.list
> #define CEPH_XATTR_NAME(_type, _name) XATTR_CEPH_PREFIX #_type "." #_name
> #define CEPH_XATTR_NAME2(_type, _name, _name2) \
> XATTR_CEPH_PREFIX #_type "." #_name "." #_name2
> @@ -237,6 +275,14 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {
> .hidden = true,
> .exists_cb = ceph_vxattrcb_layout_exists,
> },
> + {
> + .name = CEPH_XATTR_LIST_INTERNAL,
> + .name_size = sizeof(CEPH_XATTR_LIST_INTERNAL),
> + .getxattr_cb = ceph_vxattrcb_list_all,
> + .readonly = true,
> + .hidden = true,
> + .exists_cb = NULL,
> + },
> XATTR_LAYOUT_FIELD(dir, layout, stripe_unit),
> XATTR_LAYOUT_FIELD(dir, layout, stripe_count),
> XATTR_LAYOUT_FIELD(dir, layout, object_size),
> @@ -264,6 +310,14 @@ static struct ceph_vxattr ceph_file_vxattrs[] = {
> .hidden = true,
> .exists_cb = ceph_vxattrcb_layout_exists,
> },
> + {
> + .name = CEPH_XATTR_LIST_INTERNAL,
> + .name_size = sizeof(CEPH_XATTR_LIST_INTERNAL),
> + .getxattr_cb = ceph_vxattrcb_list_all,
> + .readonly = true,
> + .hidden = true,
> + .exists_cb = NULL,
> + },
> XATTR_LAYOUT_FIELD(file, layout, stripe_unit),
> XATTR_LAYOUT_FIELD(file, layout, stripe_count),
> XATTR_LAYOUT_FIELD(file, layout, object_size),
Need to change the 'hidden' attribute of all other vxattrs to false.
Regards
Yan, Zheng
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 0/2] ceph: virtual xattr handling
2016-07-21 6:49 [RFC 1/2] ceph: introduce 'ceph.all' virtual xattr Venky Shankar
2016-07-21 6:49 ` [RFC 2/2] ceph: do not return virtual xattrs in listxattr() Venky Shankar
2016-07-21 7:30 ` [RFC 1/2] ceph: introduce 'ceph.all' virtual xattr Yan, Zheng
@ 2016-07-21 12:17 ` Venky Shankar
2016-07-21 12:17 ` [PATCH 1/2] ceph: introduce 'ceph.all' virtual xattr Venky Shankar
` (2 more replies)
2 siblings, 3 replies; 9+ messages in thread
From: Venky Shankar @ 2016-07-21 12:17 UTC (permalink / raw)
To: ceph-devel; +Cc: zyan
v2: vxattrs 'hidden' attribute defaults to false
Venky Shankar (2):
ceph: introduce 'ceph.all' virtual xattr
ceph: do not return virtual xattrs in listxattr()
fs/ceph/xattr.c | 83 +++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 57 insertions(+), 26 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ceph: introduce 'ceph.all' virtual xattr
2016-07-21 12:17 ` [PATCH 0/2] ceph: virtual xattr handling Venky Shankar
@ 2016-07-21 12:17 ` Venky Shankar
2016-07-21 12:25 ` Yan, Zheng
2016-07-21 12:17 ` [PATCH 2/2] ceph: do not return virtual xattrs in listxattr() Venky Shankar
2016-07-22 4:41 ` [PATCH 0/2] ceph: virtual xattr handling Christoph Hellwig
2 siblings, 1 reply; 9+ messages in thread
From: Venky Shankar @ 2016-07-21 12:17 UTC (permalink / raw)
To: ceph-devel; +Cc: zyan
As of now listing extended attributes result in ceph dump all of
it's internal xattrs thereby confusing tools such as rsync and the
likes. This functionality would be removed in the subsequent patch,
but there needs to be a way to examine ceph's internal xattr.
Remembering all internal xattrs is cumbersome and error prone, so,
we provide a virtual xattr to fetch a list of ceph's internal xattr,
obviously excluding itself.
Signed-off-by: Venky Shankar <vshankar@redhat.com>
---
fs/ceph/xattr.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 55 insertions(+), 1 deletion(-)
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 4870b29..019f784 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -204,7 +204,45 @@ static size_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val,
(long)ci->i_rctime.tv_nsec);
}
+static struct ceph_vxattr *ceph_inode_vxattrs(struct inode *inode);
+static size_t ceph_vxattrs_name_size(struct ceph_vxattr *vxattrs);
+/* list all ceph internal xattrs */
+static size_t ceph_vxattrcb_list_all(struct ceph_inode_info *ci, char *val,
+ size_t size)
+{
+ struct inode *inode = &ci->vfs_inode;
+ struct ceph_vxattr *vxattr;
+ struct ceph_vxattr *vxattrs = ceph_inode_vxattrs(inode);
+ u32 len, namelen;
+ int err = 0;
+
+ if (!vxattrs)
+ goto out;
+
+ namelen = ceph_vxattrs_name_size(vxattrs);
+
+ err = -ERANGE;
+ if (size && (namelen > size))
+ goto out;
+ err = namelen;
+ if (size == 0)
+ goto out;
+
+ /* fill up buffer with virtual xattrs */
+ for (err = 0, vxattr = vxattrs; vxattr->name; vxattr++) {
+ if (!vxattr->hidden && !(vxattr->exists_cb
+ && !vxattr->exists_cb(ci))) {
+ len = snprintf(val + err, size - err, "%s", vxattr->name);
+ err += len + 1;
+ }
+ }
+
+ out:
+ return err;
+}
+
+#define CEPH_XATTR_LIST_INTERNAL XATTR_CEPH_PREFIX"all"
#define CEPH_XATTR_NAME(_type, _name) XATTR_CEPH_PREFIX #_type "." #_name
#define CEPH_XATTR_NAME2(_type, _name, _name2) \
XATTR_CEPH_PREFIX #_type "." #_name "." #_name2
@@ -224,7 +262,7 @@ static size_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val,
.name_size = sizeof (CEPH_XATTR_NAME2(_type, _name, _field)), \
.getxattr_cb = ceph_vxattrcb_ ## _name ## _ ## _field, \
.readonly = false, \
- .hidden = true, \
+ .hidden = false, \
.exists_cb = ceph_vxattrcb_layout_exists, \
}
@@ -237,6 +275,14 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {
.hidden = true,
.exists_cb = ceph_vxattrcb_layout_exists,
},
+ {
+ .name = CEPH_XATTR_LIST_INTERNAL,
+ .name_size = sizeof(CEPH_XATTR_LIST_INTERNAL),
+ .getxattr_cb = ceph_vxattrcb_list_all,
+ .readonly = true,
+ .hidden = true,
+ .exists_cb = NULL,
+ },
XATTR_LAYOUT_FIELD(dir, layout, stripe_unit),
XATTR_LAYOUT_FIELD(dir, layout, stripe_count),
XATTR_LAYOUT_FIELD(dir, layout, object_size),
@@ -264,6 +310,14 @@ static struct ceph_vxattr ceph_file_vxattrs[] = {
.hidden = true,
.exists_cb = ceph_vxattrcb_layout_exists,
},
+ {
+ .name = CEPH_XATTR_LIST_INTERNAL,
+ .name_size = sizeof(CEPH_XATTR_LIST_INTERNAL),
+ .getxattr_cb = ceph_vxattrcb_list_all,
+ .readonly = true,
+ .hidden = true,
+ .exists_cb = NULL,
+ },
XATTR_LAYOUT_FIELD(file, layout, stripe_unit),
XATTR_LAYOUT_FIELD(file, layout, stripe_count),
XATTR_LAYOUT_FIELD(file, layout, object_size),
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] ceph: do not return virtual xattrs in listxattr()
2016-07-21 12:17 ` [PATCH 0/2] ceph: virtual xattr handling Venky Shankar
2016-07-21 12:17 ` [PATCH 1/2] ceph: introduce 'ceph.all' virtual xattr Venky Shankar
@ 2016-07-21 12:17 ` Venky Shankar
2016-07-22 4:41 ` [PATCH 0/2] ceph: virtual xattr handling Christoph Hellwig
2 siblings, 0 replies; 9+ messages in thread
From: Venky Shankar @ 2016-07-21 12:17 UTC (permalink / raw)
To: ceph-devel; +Cc: zyan
Signed-off-by: Venky Shankar <vshankar@redhat.com>
---
fs/ceph/xattr.c | 27 ++-------------------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 019f784..816c4ef 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -848,12 +848,8 @@ ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size)
{
struct inode *inode = d_inode(dentry);
struct ceph_inode_info *ci = ceph_inode(inode);
- struct ceph_vxattr *vxattrs = ceph_inode_vxattrs(inode);
- u32 vir_namelen = 0;
u32 namelen;
int err;
- u32 len;
- int i;
spin_lock(&ci->i_ceph_lock);
dout("listxattr %p ver=%lld index_ver=%lld\n", inode,
@@ -871,38 +867,19 @@ ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size)
err = __build_xattrs(inode);
if (err < 0)
goto out;
- /*
- * Start with virtual dir xattr names (if any) (including
- * terminating '\0' characters for each).
- */
- vir_namelen = ceph_vxattrs_name_size(vxattrs);
/* adding 1 byte per each variable due to the null termination */
namelen = ci->i_xattrs.names_size + ci->i_xattrs.count;
err = -ERANGE;
- if (size && vir_namelen + namelen > size)
+ if (size && namelen > size)
goto out;
- err = namelen + vir_namelen;
+ err = namelen;
if (size == 0)
goto out;
names = __copy_xattr_names(ci, names);
- /* virtual xattr names, too */
- err = namelen;
- if (vxattrs) {
- for (i = 0; vxattrs[i].name; i++) {
- if (!vxattrs[i].hidden &&
- !(vxattrs[i].exists_cb &&
- !vxattrs[i].exists_cb(ci))) {
- len = sprintf(names, "%s", vxattrs[i].name);
- names += len + 1;
- err += len + 1;
- }
- }
- }
-
out:
spin_unlock(&ci->i_ceph_lock);
return err;
--
2.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] ceph: introduce 'ceph.all' virtual xattr
2016-07-21 12:17 ` [PATCH 1/2] ceph: introduce 'ceph.all' virtual xattr Venky Shankar
@ 2016-07-21 12:25 ` Yan, Zheng
2016-07-21 12:55 ` Venky Shankar
0 siblings, 1 reply; 9+ messages in thread
From: Yan, Zheng @ 2016-07-21 12:25 UTC (permalink / raw)
To: Venky Shankar; +Cc: ceph-devel, Zheng Yan
On Thu, Jul 21, 2016 at 8:17 PM, Venky Shankar <vshankar@redhat.com> wrote:
> As of now listing extended attributes result in ceph dump all of
> it's internal xattrs thereby confusing tools such as rsync and the
> likes. This functionality would be removed in the subsequent patch,
> but there needs to be a way to examine ceph's internal xattr.
>
> Remembering all internal xattrs is cumbersome and error prone, so,
> we provide a virtual xattr to fetch a list of ceph's internal xattr,
> obviously excluding itself.
>
> Signed-off-by: Venky Shankar <vshankar@redhat.com>
> ---
> fs/ceph/xattr.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 55 insertions(+), 1 deletion(-)
>
> diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
> index 4870b29..019f784 100644
> --- a/fs/ceph/xattr.c
> +++ b/fs/ceph/xattr.c
> @@ -204,7 +204,45 @@ static size_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val,
> (long)ci->i_rctime.tv_nsec);
> }
>
> +static struct ceph_vxattr *ceph_inode_vxattrs(struct inode *inode);
> +static size_t ceph_vxattrs_name_size(struct ceph_vxattr *vxattrs);
>
> +/* list all ceph internal xattrs */
> +static size_t ceph_vxattrcb_list_all(struct ceph_inode_info *ci, char *val,
> + size_t size)
> +{
> + struct inode *inode = &ci->vfs_inode;
> + struct ceph_vxattr *vxattr;
> + struct ceph_vxattr *vxattrs = ceph_inode_vxattrs(inode);
> + u32 len, namelen;
> + int err = 0;
> +
> + if (!vxattrs)
> + goto out;
> +
> + namelen = ceph_vxattrs_name_size(vxattrs);
> +
> + err = -ERANGE;
> + if (size && (namelen > size))
> + goto out;
> + err = namelen;
> + if (size == 0)
> + goto out;
> +
> + /* fill up buffer with virtual xattrs */
> + for (err = 0, vxattr = vxattrs; vxattr->name; vxattr++) {
> + if (!vxattr->hidden && !(vxattr->exists_cb
> + && !vxattr->exists_cb(ci))) {
> + len = snprintf(val + err, size - err, "%s", vxattr->name);
> + err += len + 1;
> + }
> + }
> +
> + out:
> + return err;
> +}
> +
> +#define CEPH_XATTR_LIST_INTERNAL XATTR_CEPH_PREFIX"all"
> #define CEPH_XATTR_NAME(_type, _name) XATTR_CEPH_PREFIX #_type "." #_name
> #define CEPH_XATTR_NAME2(_type, _name, _name2) \
> XATTR_CEPH_PREFIX #_type "." #_name "." #_name2
> @@ -224,7 +262,7 @@ static size_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val,
> .name_size = sizeof (CEPH_XATTR_NAME2(_type, _name, _field)), \
> .getxattr_cb = ceph_vxattrcb_ ## _name ## _ ## _field, \
> .readonly = false, \
> - .hidden = true, \
> + .hidden = false, \
> .exists_cb = ceph_vxattrcb_layout_exists, \
> }
>
> @@ -237,6 +275,14 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {
> .hidden = true,
> .exists_cb = ceph_vxattrcb_layout_exists,
> },
> + {
> + .name = CEPH_XATTR_LIST_INTERNAL,
> + .name_size = sizeof(CEPH_XATTR_LIST_INTERNAL),
> + .getxattr_cb = ceph_vxattrcb_list_all,
> + .readonly = true,
> + .hidden = true,
> + .exists_cb = NULL,
> + },
> XATTR_LAYOUT_FIELD(dir, layout, stripe_unit),
> XATTR_LAYOUT_FIELD(dir, layout, stripe_count),
> XATTR_LAYOUT_FIELD(dir, layout, object_size),
> @@ -264,6 +310,14 @@ static struct ceph_vxattr ceph_file_vxattrs[] = {
> .hidden = true,
> .exists_cb = ceph_vxattrcb_layout_exists,
> },
> + {
> + .name = CEPH_XATTR_LIST_INTERNAL,
> + .name_size = sizeof(CEPH_XATTR_LIST_INTERNAL),
> + .getxattr_cb = ceph_vxattrcb_list_all,
> + .readonly = true,
> + .hidden = true,
> + .exists_cb = NULL,
> + },
> XATTR_LAYOUT_FIELD(file, layout, stripe_unit),
> XATTR_LAYOUT_FIELD(file, layout, stripe_count),
> XATTR_LAYOUT_FIELD(file, layout, object_size),
> --
ceph.dir.layout is still hidden?
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] ceph: introduce 'ceph.all' virtual xattr
2016-07-21 12:25 ` Yan, Zheng
@ 2016-07-21 12:55 ` Venky Shankar
0 siblings, 0 replies; 9+ messages in thread
From: Venky Shankar @ 2016-07-21 12:55 UTC (permalink / raw)
To: Yan, Zheng; +Cc: ceph-devel, Zheng Yan
On 16-07-21 20:25:37, Yan, Zheng wrote:
> On Thu, Jul 21, 2016 at 8:17 PM, Venky Shankar <vshankar@redhat.com> wrote:
> > As of now listing extended attributes result in ceph dump all of
> > it's internal xattrs thereby confusing tools such as rsync and the
> > likes. This functionality would be removed in the subsequent patch,
> > but there needs to be a way to examine ceph's internal xattr.
> >
> > Remembering all internal xattrs is cumbersome and error prone, so,
> > we provide a virtual xattr to fetch a list of ceph's internal xattr,
> > obviously excluding itself.
> >
> > Signed-off-by: Venky Shankar <vshankar@redhat.com>
> > ---
> > fs/ceph/xattr.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> > 1 file changed, 55 insertions(+), 1 deletion(-)
> >
> > diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
> > index 4870b29..019f784 100644
> > --- a/fs/ceph/xattr.c
> > +++ b/fs/ceph/xattr.c
> > @@ -204,7 +204,45 @@ static size_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val,
> > (long)ci->i_rctime.tv_nsec);
> > }
> >
> > +static struct ceph_vxattr *ceph_inode_vxattrs(struct inode *inode);
> > +static size_t ceph_vxattrs_name_size(struct ceph_vxattr *vxattrs);
> >
> > +/* list all ceph internal xattrs */
> > +static size_t ceph_vxattrcb_list_all(struct ceph_inode_info *ci, char *val,
> > + size_t size)
> > +{
> > + struct inode *inode = &ci->vfs_inode;
> > + struct ceph_vxattr *vxattr;
> > + struct ceph_vxattr *vxattrs = ceph_inode_vxattrs(inode);
> > + u32 len, namelen;
> > + int err = 0;
> > +
> > + if (!vxattrs)
> > + goto out;
> > +
> > + namelen = ceph_vxattrs_name_size(vxattrs);
> > +
> > + err = -ERANGE;
> > + if (size && (namelen > size))
> > + goto out;
> > + err = namelen;
> > + if (size == 0)
> > + goto out;
> > +
> > + /* fill up buffer with virtual xattrs */
> > + for (err = 0, vxattr = vxattrs; vxattr->name; vxattr++) {
> > + if (!vxattr->hidden && !(vxattr->exists_cb
> > + && !vxattr->exists_cb(ci))) {
> > + len = snprintf(val + err, size - err, "%s", vxattr->name);
> > + err += len + 1;
> > + }
> > + }
> > +
> > + out:
> > + return err;
> > +}
> > +
> > +#define CEPH_XATTR_LIST_INTERNAL XATTR_CEPH_PREFIX"all"
> > #define CEPH_XATTR_NAME(_type, _name) XATTR_CEPH_PREFIX #_type "." #_name
> > #define CEPH_XATTR_NAME2(_type, _name, _name2) \
> > XATTR_CEPH_PREFIX #_type "." #_name "." #_name2
> > @@ -224,7 +262,7 @@ static size_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val,
> > .name_size = sizeof (CEPH_XATTR_NAME2(_type, _name, _field)), \
> > .getxattr_cb = ceph_vxattrcb_ ## _name ## _ ## _field, \
> > .readonly = false, \
> > - .hidden = true, \
> > + .hidden = false, \
> > .exists_cb = ceph_vxattrcb_layout_exists, \
> > }
> >
> > @@ -237,6 +275,14 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {
> > .hidden = true,
> > .exists_cb = ceph_vxattrcb_layout_exists,
> > },
> > + {
> > + .name = CEPH_XATTR_LIST_INTERNAL,
> > + .name_size = sizeof(CEPH_XATTR_LIST_INTERNAL),
> > + .getxattr_cb = ceph_vxattrcb_list_all,
> > + .readonly = true,
> > + .hidden = true,
> > + .exists_cb = NULL,
> > + },
> > XATTR_LAYOUT_FIELD(dir, layout, stripe_unit),
> > XATTR_LAYOUT_FIELD(dir, layout, stripe_count),
> > XATTR_LAYOUT_FIELD(dir, layout, object_size),
> > @@ -264,6 +310,14 @@ static struct ceph_vxattr ceph_file_vxattrs[] = {
> > .hidden = true,
> > .exists_cb = ceph_vxattrcb_layout_exists,
> > },
> > + {
> > + .name = CEPH_XATTR_LIST_INTERNAL,
> > + .name_size = sizeof(CEPH_XATTR_LIST_INTERNAL),
> > + .getxattr_cb = ceph_vxattrcb_list_all,
> > + .readonly = true,
> > + .hidden = true,
> > + .exists_cb = NULL,
> > + },
> > XATTR_LAYOUT_FIELD(file, layout, stripe_unit),
> > XATTR_LAYOUT_FIELD(file, layout, stripe_count),
> > XATTR_LAYOUT_FIELD(file, layout, object_size),
> > --
>
> ceph.dir.layout is still hidden?
I left that as hidden as ceph.all returns stripe_unit, count etc. (only keys)
Should we make ceph.dir.layout unhidden and hide stripe_unit etc as we get that from the layout itself?
>
>
>
> > 2.1.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Venky
#overclk [freenode, oftc]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] ceph: virtual xattr handling
2016-07-21 12:17 ` [PATCH 0/2] ceph: virtual xattr handling Venky Shankar
2016-07-21 12:17 ` [PATCH 1/2] ceph: introduce 'ceph.all' virtual xattr Venky Shankar
2016-07-21 12:17 ` [PATCH 2/2] ceph: do not return virtual xattrs in listxattr() Venky Shankar
@ 2016-07-22 4:41 ` Christoph Hellwig
2 siblings, 0 replies; 9+ messages in thread
From: Christoph Hellwig @ 2016-07-22 4:41 UTC (permalink / raw)
To: Venky Shankar; +Cc: ceph-devel, zyan
On Thu, Jul 21, 2016 at 05:47:28PM +0530, Venky Shankar wrote:
> v2: vxattrs 'hidden' attribute defaults to false
>
> Venky Shankar (2):
> ceph: introduce 'ceph.all' virtual xattr
> ceph: do not return virtual xattrs in listxattr()
NAK. No new magic namespaces outside the documented systems ones,
please. And especially no 'magic' attributes in 'magic' namespaces.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-07-22 4:41 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-21 6:49 [RFC 1/2] ceph: introduce 'ceph.all' virtual xattr Venky Shankar
2016-07-21 6:49 ` [RFC 2/2] ceph: do not return virtual xattrs in listxattr() Venky Shankar
2016-07-21 7:30 ` [RFC 1/2] ceph: introduce 'ceph.all' virtual xattr Yan, Zheng
2016-07-21 12:17 ` [PATCH 0/2] ceph: virtual xattr handling Venky Shankar
2016-07-21 12:17 ` [PATCH 1/2] ceph: introduce 'ceph.all' virtual xattr Venky Shankar
2016-07-21 12:25 ` Yan, Zheng
2016-07-21 12:55 ` Venky Shankar
2016-07-21 12:17 ` [PATCH 2/2] ceph: do not return virtual xattrs in listxattr() Venky Shankar
2016-07-22 4:41 ` [PATCH 0/2] ceph: virtual xattr handling Christoph Hellwig
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.