diff --git a/.githubmap b/.githubmap
index 78f91284a5e..06b1241e3bd 100644
--- a/.githubmap
+++ b/.githubmap
@@ -212,3 +212,4 @@ mkogan1 Mark Kogan <mkogan@redhat.com>
 smanjara Shilpa Jagannath <smanjara@redhat.com>
 arbtfnf anuragbandhu <anuragbandhu007@gmail.com>
 aainscow Alex Ainscow <aainscow@uk.ibm.com>
+salieri11 Igor Golikov <igolikov@ibm.com>
diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 14f2465d72c..8d8e268a921 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -2528,8 +2528,14 @@ void CDir::_omap_commit_ops(int r, int op_prio, int64_t metapool, version_t vers
     }
 
     unsigned size = item.key.length() + bl.length() + 2 * sizeof(__u32);
-    if (write_size > 0 && write_size + size > max_write_size)
-      commit_one();
+    if (write_size > 0 && write_size + size > max_write_size) {
+      if (!_set.empty() || !_rm.empty()) {
+        commit_one();
+      } else {
+        dout(1) << "skipping empty commit, inode size exceeded max_dir_commit_size ("
+                << size << " vs. " << max_write_size << ")" << dendl;
+      }
+    }
 
     write_size += size;
     _set[std::move(item.key)] = std::move(bl);