Skip to contentSkip to conversation

ceph: acquire Fs caps when getting dir stats

RFC PATCH In review Jeff Layton 3 participants 3 messages Nov 3, 2020 – Nov 10, 2020 Ceph client

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 ceph: acquire Fs caps when getting dir stats

We only update the inode's dirstats when we have Fs caps from the MDS.

Declare a new VXATTR_FLAG_DIRSTAT that we set on all dirstats, and have the vxattr handling code acquire Fs caps when it's set.

URL: https://tracker.ceph.com/issues/48104

---
 fs/ceph/xattr.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
fs/ceph/xattr.c +6 -3
index 197cb1234341..0fd05d3d4399 100644
@@ -42,6 +42,7 @@ struct ceph_vxattr {
 #define VXATTR_FLAG_READONLY		(1<<0)
 #define VXATTR_FLAG_HIDDEN		(1<<1)
 #define VXATTR_FLAG_RSTAT		(1<<2)
+#define VXATTR_FLAG_DIRSTAT		(1<<3)
 
 /* layouts */
 
@@ -347,9 +348,9 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {
 	XATTR_LAYOUT_FIELD(dir, layout, object_size),
 	XATTR_LAYOUT_FIELD(dir, layout, pool),
 	XATTR_LAYOUT_FIELD(dir, layout, pool_namespace),
-	XATTR_NAME_CEPH(dir, entries, 0),
-	XATTR_NAME_CEPH(dir, files, 0),
-	XATTR_NAME_CEPH(dir, subdirs, 0),
+	XATTR_NAME_CEPH(dir, entries, VXATTR_FLAG_DIRSTAT),
+	XATTR_NAME_CEPH(dir, files, VXATTR_FLAG_DIRSTAT),
+	XATTR_NAME_CEPH(dir, subdirs, VXATTR_FLAG_DIRSTAT),
 	XATTR_RSTAT_FIELD(dir, rentries),
 	XATTR_RSTAT_FIELD(dir, rfiles),
 	XATTR_RSTAT_FIELD(dir, rsubdirs),
@@ -837,6 +838,8 @@ ssize_t __ceph_getxattr(struct inode *inode, const char *name, void *value,
 		int mask = 0;
 		if (vxattr->flags & VXATTR_FLAG_RSTAT)
 			mask |= CEPH_STAT_RSTAT;
+		if (vxattr->flags & VXATTR_FLAG_DIRSTAT)
+			mask |= CEPH_CAP_FILE_SHARED;
 		err = ceph_do_getattr(inode, mask, true);
 		if (err)
 			return err;
Signature · 1 line
2.28.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 39 lines · Jeff Layton

We only update the inode's dirstats when we have Fs caps from the MDS.

Declare a new VXATTR_FLAG_DIRSTAT that we set on all dirstats, and have the vxattr handling code acquire Fs caps when it's set.

URL: https://tracker.ceph.com/issues/48104

---
 fs/ceph/xattr.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
fs/ceph/xattr.c +4 -3
index 197cb1234341..0fd05d3d4399 100644
@@ -42,6 +42,7 @@ struct ceph_vxattr {
 #define VXATTR_FLAG_READONLY           (1<<0)
 #define VXATTR_FLAG_HIDDEN             (1<<1)
 #define VXATTR_FLAG_RSTAT              (1<<2)
+#define VXATTR_FLAG_DIRSTAT            (1<<3)
 
 /* layouts */
 
@@ -347,9 +348,9 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {
        XATTR_LAYOUT_FIELD(dir, layout, object_size),
        XATTR_LAYOUT_FIELD(dir, layout, pool),
        XATTR_LAYOUT_FIELD(dir, layout, pool_namespace),
-       XATTR_NAME_CEPH(dir, entries, 0),
-       XATTR_NAME_CEPH(dir, files, 0),
-       XATTR_NAME_CEPH(dir, subdirs, 0),
+       XATTR_NAME_CEPH(dir, entries, VXATTR_FLAG_DIRSTAT),
+       XATTR_NAME_CEPH(dir, files, VXATTR_FLAG_DIRSTAT),
+       XATTR_NAME_CEPH(dir, subdirs, VXATTR_FLAG_DIRSTAT),
        XATTR_RSTAT_FIELD(dir, rentries),
        XATTR_RSTAT_FIELD(dir, rfiles),
        XATTR_RSTAT_FIELD(dir, rsubdirs),

fs/ceph/xattr.c ssize_t __ceph_getxattr(struct inode *inode, const char *name, void *value, · line 845

Quoted 8 lines
fs/ceph/xattr.c +2 -0
@@ -837,6 +838,8 @@ ssize_t __ceph_getxattr(struct inode *inode, const char *name, void *value,
                int mask = 0;
                if (vxattr->flags & VXATTR_FLAG_RSTAT)
                        mask |= CEPH_STAT_RSTAT;
+               if (vxattr->flags & VXATTR_FLAG_DIRSTAT)
+                       mask |= CEPH_CAP_FILE_SHARED;
                err = ceph_do_getattr(inode, mask, true);
                if (err)
                        return err;
Signature · 5 lines
Patrick Donnelly, Ph.D.
He / Him / His
Principal Software Engineer
Red Hat Sunnyvale, CA
GPG: 19F28A586F808C2402351B93C3301A3E258DD79D
Reviewed-by on v1 1/1
#2 lore raw
In reply to Jeff Layton
Quoted 38 lines · Jeff Layton

We only update the inode's dirstats when we have Fs caps from the MDS.

Declare a new VXATTR_FLAG_DIRSTAT that we set on all dirstats, and have the vxattr handling code acquire Fs caps when it's set.

URL: https://tracker.ceph.com/issues/48104

---
  fs/ceph/xattr.c | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
fs/ceph/xattr.c +4 -3
index 197cb1234341..0fd05d3d4399 100644
@@ -42,6 +42,7 @@ struct ceph_vxattr {
  #define VXATTR_FLAG_READONLY		(1<<0)
  #define VXATTR_FLAG_HIDDEN		(1<<1)
  #define VXATTR_FLAG_RSTAT		(1<<2)
+#define VXATTR_FLAG_DIRSTAT		(1<<3)
 
  /* layouts */
 
@@ -347,9 +348,9 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = {
  	XATTR_LAYOUT_FIELD(dir, layout, object_size),
  	XATTR_LAYOUT_FIELD(dir, layout, pool),
  	XATTR_LAYOUT_FIELD(dir, layout, pool_namespace),
-	XATTR_NAME_CEPH(dir, entries, 0),
-	XATTR_NAME_CEPH(dir, files, 0),
-	XATTR_NAME_CEPH(dir, subdirs, 0),
+	XATTR_NAME_CEPH(dir, entries, VXATTR_FLAG_DIRSTAT),
+	XATTR_NAME_CEPH(dir, files, VXATTR_FLAG_DIRSTAT),
+	XATTR_NAME_CEPH(dir, subdirs, VXATTR_FLAG_DIRSTAT),
  	XATTR_RSTAT_FIELD(dir, rentries),
  	XATTR_RSTAT_FIELD(dir, rfiles),
  	XATTR_RSTAT_FIELD(dir, rsubdirs),

fs/ceph/xattr.c ssize_t __ceph_getxattr(struct inode *inode, const char *name, void *value, · line 845

Quoted 8 lines
fs/ceph/xattr.c +2 -0
@@ -837,6 +838,8 @@ ssize_t __ceph_getxattr(struct inode *inode, const char *name, void *value,
  		int mask = 0;
  		if (vxattr->flags & VXATTR_FLAG_RSTAT)
  			mask |= CEPH_STAT_RSTAT;
+		if (vxattr->flags & VXATTR_FLAG_DIRSTAT)
+			mask |= CEPH_CAP_FILE_SHARED;
  		err = ceph_do_getattr(inode, mask, true);
  		if (err)
  			return err;