2 files changed, 18 insertions, 3 deletions

diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 1f60498c4631..6cd92a0e2af9 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -936,7 +936,8 @@ static int ceph_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
                 goto out;
         }
 
-        if (ceph_quota_is_max_files_exceeded(dir)) {
+        if (op == CEPH_MDS_OP_MKDIR &&
+            ceph_quota_is_max_files_exceeded(dir)) {
                 err = -EDQUOT;
                 goto out;
         }
diff --git a/fs/ceph/quota.c b/fs/ceph/quota.c
index 7d1e18e2249f..529de67393a9 100644
--- a/fs/ceph/quota.c
+++ b/fs/ceph/quota.c
@@ -86,8 +86,15 @@ static struct ceph_snap_realm *get_quota_realm(struct ceph_mds_client *mdsc,
         struct ceph_vino vino;
         struct inode *in;
 
+        if (ceph_snap(inode) != CEPH_NOSNAP)
+                return NULL;
+
         realm = ceph_inode(inode)->i_snap_realm;
-        ceph_get_snap_realm(mdsc, realm);
+        if (realm)
+                ceph_get_snap_realm(mdsc, realm);
+        else
+                pr_err_ratelimited("get_quota_realm: ino (%llx.%llx) "
+                                   "null i_snap_realm\n", ceph_vinop(inode));
         while (realm) {
                 vino.ino = realm->ino;
                 vino.snap = CEPH_NOSNAP;
@@ -158,9 +165,16 @@ static bool check_quota_exceeded(struct inode *inode, enum quota_check_op op,
         bool is_root;
         bool exceeded = false;
 
+        if (ceph_snap(inode) != CEPH_NOSNAP)
+                return false;
+
         down_read(&mdsc->snap_rwsem);
         realm = ceph_inode(inode)->i_snap_realm;
-        ceph_get_snap_realm(mdsc, realm);
+        if (realm)
+                ceph_get_snap_realm(mdsc, realm);
+        else
+                pr_err_ratelimited("check_quota_exceeded: ino (%llx.%llx) "
+                                   "null i_snap_realm\n", ceph_vinop(inode));
         while (realm) {
                 vino.ino = realm->ino;
                 vino.snap = CEPH_NOSNAP;