From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 4 Jan 2024 17:24:29 +0000 (-0500)
Subject: mds: simplify assert
X-Git-Tag: testing/wip-root-testing-20240411.174241~89^2~51
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=17faf3d757469dc080b4c36476bb8fc1990eb33f;p=ceph-ci.git

mds: simplify assert

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

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 017cb74555d..782b3422d20 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -149,8 +149,7 @@ bool Locker::try_rdlock_snap_layout(CInode *in, const MDRequestRef& mdr,
   bool found_locked = false;
   bool found_layout = false;
 
-  if (want_layout)
-    ceph_assert(n == 0);
+  ceph_assert(!want_layout || n == 0);
 
   client_t client = mdr->get_client();