From: Erqi Chen <chenerqi@gmail.com>
Date: Sat, 24 Oct 2020 06:50:49 +0000 (+0800)
Subject: mds: fix count error of modified dentries
X-Git-Tag: v16.1.0~739^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e76073ef195dabfecfe515d594e45e78c6542e90;p=ceph-ci.git

mds: fix count error of modified dentries

CDir::_omap_commit counts modified dentries, for fragmenting
new dir modified dentries include head and snap items.

Fixes: https://tracker.ceph.com/issues/47981
Signed-off-by: Erqi Chen <chenerqi@gmail.com>
---

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 3eedef3d1c1..f9552c10d5b 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -2351,7 +2351,7 @@ void CDir::_omap_commit(int op_prio)
 
   size_t count = 0;
   if (state_test(CDir::STATE_FRAGMENTING) && is_new()) {
-    count = get_num_head_items() && get_num_snap_items();
+    count = get_num_head_items() + get_num_snap_items();
   } else {
     for (elist<CDentry*>::iterator it = dirty_dentries.begin(); !it.end(); ++it)
       ++count;