From e76073ef195dabfecfe515d594e45e78c6542e90 Mon Sep 17 00:00:00 2001 From: Erqi Chen Date: Sat, 24 Oct 2020 14:50:49 +0800 Subject: [PATCH] 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 --- src/mds/CDir.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc index 3eedef3d1c1ed..f9552c10d5b04 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::iterator it = dirty_dentries.begin(); !it.end(); ++it) ++count; -- 2.39.5