ceph: fix statfs for subdir mounts

When doing a mount using as base a directory that has 'max_bytes' quotas
statfs uses that value as the total; if a subdirectory is used instead,
the same 'max_bytes' too in statfs, unless there is another quota set.

Unfortunately, if this subdirectory only has the 'max_files' quota set,
then statfs uses the filesystem total.  Fix this by making sure we only
lookup realms that contain the 'max_bytes' quota.

Cc: Ryan Taylor <rptaylor@uvic.ca>
URL: https://tracker.ceph.com/issues/55090
Signed-off-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 2db1a21..b7e9cac 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -578,7 +578,7 @@ void ceph_evict_inode(struct inode *inode)
 
        __ceph_remove_caps(ci);
 
-       if (__ceph_has_any_quota(ci))
+       if (__ceph_has_quota(ci, QUOTA_GET_ANY))
                ceph_adjust_quota_realms_count(inode, false);
 
        /*

diff --git a/fs/ceph/quota.c b/fs/ceph/quota.c
index a338a3e..64592ad 100644 (file)
--- a/fs/ceph/quota.c
+++ b/fs/ceph/quota.c
@@ -195,9 +195,9 @@ void ceph_cleanup_quotarealms_inodes(struct ceph_mds_client *mdsc)
 
 /*
  * This function walks through the snaprealm for an inode and returns the
- * ceph_snap_realm for the first snaprealm that has quotas set (either max_files
- * or max_bytes).  If the root is reached, return the root ceph_snap_realm
- * instead.
+ * ceph_snap_realm for the first snaprealm that has quotas set (max_files,
+ * max_bytes, or any, depending on the 'which_quota' argument).  If the root is
+ * reached, return the root ceph_snap_realm instead.
  *
  * Note that the caller is responsible for calling ceph_put_snap_realm() on the
  * returned realm.
@@ -209,7 +209,9 @@ void ceph_cleanup_quotarealms_inodes(struct ceph_mds_client *mdsc)
  * will be restarted.
  */
 static struct ceph_snap_realm *get_quota_realm(struct ceph_mds_client *mdsc,
-                                              struct inode *inode, bool retry)
+                                              struct inode *inode,
+                                              enum quota_get_realm which_quota,
+                                              bool retry)
 {
        struct ceph_inode_info *ci = NULL;
        struct ceph_snap_realm *realm, *next;
@@ -248,7 +250,7 @@ restart:
                }
 
                ci = ceph_inode(in);
-               has_quota = __ceph_has_any_quota(ci);
+               has_quota = __ceph_has_quota(ci, which_quota);
                iput(in);
 
                next = realm->parent;
@@ -279,8 +281,8 @@ restart:
         * dropped and we can then restart the whole operation.
         */
        down_read(&mdsc->snap_rwsem);
-       old_realm = get_quota_realm(mdsc, old, true);
-       new_realm = get_quota_realm(mdsc, new, false);
+       old_realm = get_quota_realm(mdsc, old, QUOTA_GET_ANY, true);
+       new_realm = get_quota_realm(mdsc, new, QUOTA_GET_ANY, false);
        if (PTR_ERR(new_realm) == -EAGAIN) {
                up_read(&mdsc->snap_rwsem);
                if (old_realm)
@@ -483,7 +485,8 @@ bool ceph_quota_update_statfs(struct ceph_fs_client *fsc, struct kstatfs *buf)
        bool is_updated = false;
 
        down_read(&mdsc->snap_rwsem);
-       realm = get_quota_realm(mdsc, d_inode(fsc->sb->s_root), true);
+       realm = get_quota_realm(mdsc, d_inode(fsc->sb->s_root),
+                               QUOTA_GET_MAX_BYTES, true);
        up_read(&mdsc->snap_rwsem);
        if (!realm)
                return false;

diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index d749c96..dd7dac0 100644 (file)
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -1279,9 +1279,29 @@ extern void ceph_fs_debugfs_init(struct ceph_fs_client *client);
 extern void ceph_fs_debugfs_cleanup(struct ceph_fs_client *client);
 
 /* quota.c */
-static inline bool __ceph_has_any_quota(struct ceph_inode_info *ci)
+
+enum quota_get_realm {
+       QUOTA_GET_MAX_FILES,
+       QUOTA_GET_MAX_BYTES,
+       QUOTA_GET_ANY
+};
+
+static inline bool __ceph_has_quota(struct ceph_inode_info *ci,
+                                   enum quota_get_realm which)
 {
-       return ci->i_max_files || ci->i_max_bytes;
+       bool has_quota = false;
+
+       switch (which) {
+       case QUOTA_GET_MAX_BYTES:
+               has_quota = !!ci->i_max_bytes;
+               break;
+       case QUOTA_GET_MAX_FILES:
+               has_quota = !!ci->i_max_files;
+               break;
+       default:
+               has_quota = !!(ci->i_max_files || ci->i_max_bytes);
+       }
+       return has_quota;
 }
 
 extern void ceph_adjust_quota_realms_count(struct inode *inode, bool inc);
@@ -1290,10 +1310,10 @@ static inline void __ceph_update_quota(struct ceph_inode_info *ci,
                                       u64 max_bytes, u64 max_files)
 {
        bool had_quota, has_quota;
-       had_quota = __ceph_has_any_quota(ci);
+       had_quota = __ceph_has_quota(ci, QUOTA_GET_ANY);
        ci->i_max_bytes = max_bytes;
        ci->i_max_files = max_files;
-       has_quota = __ceph_has_any_quota(ci);
+       has_quota = __ceph_has_quota(ci, QUOTA_GET_ANY);
 
        if (had_quota != has_quota)
                ceph_adjust_quota_realms_count(&ci->vfs_inode, has_quota);