From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 10 Jan 2023 20:35:04 +0000 (-0500)
Subject: mds: cleanup code
X-Git-Tag: v18.1.0~33^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dec7131d5b33ef087cf77a91808396d9d8d5a14c;p=ceph.git

mds: cleanup code

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 17d826551cd9466b4c5457e668d581baa9252c91)
---

diff --git a/src/mds/events/EMetaBlob.h b/src/mds/events/EMetaBlob.h
index 6e4a8ea5ef0..4d51ff0f426 100644
--- a/src/mds/events/EMetaBlob.h
+++ b/src/mds/events/EMetaBlob.h
@@ -499,13 +499,12 @@ private:
     // primary or remote
     if (dn->get_projected_linkage()->is_remote()) {
       add_remote_dentry(dn, dirty);
-      return;
     } else if (dn->get_projected_linkage()->is_null()) {
       add_null_dentry(dn, dirty);
-      return;
+    } else {
+      ceph_assert(dn->get_projected_linkage()->is_primary());
+      add_primary_dentry(dn, 0, dirty, dirty_parent, dirty_pool);
     }
-    ceph_assert(dn->get_projected_linkage()->is_primary());
-    add_primary_dentry(dn, 0, dirty, dirty_parent, dirty_pool);
   }
 
   void add_root(bool dirty, CInode *in) {