]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mds: fix count error of modified dentries
authorErqi Chen <chenerqi@gmail.com>
Sat, 24 Oct 2020 06:50:49 +0000 (14:50 +0800)
committerErqi Chen <chenerqi@gmail.com>
Wed, 28 Oct 2020 03:11:19 +0000 (11:11 +0800)
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>
src/mds/CDir.cc

index 3eedef3d1c1ed216d4b7d6f9c9cd8acc74f1a32c..f9552c10d5b0408421d205ad623bcb3a30668143 100644 (file)
@@ -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;