From: Venky Shankar <vshankar@redhat.com>
Date: Tue, 29 Nov 2022 11:41:35 +0000 (+0530)
Subject: mds: remove redundant frag check in MDBalancer::maybe_fragment()
X-Git-Tag: v18.1.0~680^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=244feb08d21d8fa3cd5812e2bd9aa1e03e7333a3;p=ceph.git

mds: remove redundant frag check in MDBalancer::maybe_fragment()

CDir::should_merge() checks this anyway.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
---

diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index bd00db9f53f1..baa43bb43412 100644
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -1243,8 +1243,7 @@ void MDBalancer::maybe_fragment(CDir *dir, bool hot)
     }
 
     // merge?
-    if (dir->get_frag() != frag_t() && dir->should_merge() &&
-	merge_pending.count(dir->dirfrag()) == 0) {
+    if (dir->should_merge() && merge_pending.count(dir->dirfrag()) == 0) {
       queue_merge(dir);
     }
   }