From: Venky Shankar <vshankar@redhat.com>
Date: Thu, 4 Apr 2024 11:34:13 +0000 (+0530)
Subject: Merge PR #55914 into main
X-Git-Tag: v20.0.0~2224
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c947013376a9c814a01832412390810effd259a1;p=ceph.git

Merge PR #55914 into main

* refs/pull/55914/head:
	mds: do not use item item_caps in two different lists
	mds: add new item item_to_flush

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
---

c947013376a9c814a01832412390810effd259a1
diff --cc src/mds/CInode.cc
index d6ca9b31610,7c4e64de45b..33cc0b9eb28
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@@ -328,8 -322,8 +328,9 @@@ CInode::CInode(MDCache *c, bool auth, s
      item_dirty_dirfrag_dir(this),
      item_dirty_dirfrag_nest(this),
      item_dirty_dirfrag_dirfragtree(this),
+     item_to_flush(this),
      pop(c->decayrate),
 +    quiescelock(this, &quiescelock_type),
      versionlock(this, &versionlock_type),
      authlock(this, &authlock_type),
      linklock(this, &linklock_type),