]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #55914 into main
authorVenky Shankar <vshankar@redhat.com>
Thu, 4 Apr 2024 11:34:13 +0000 (17:04 +0530)
committerVenky Shankar <vshankar@redhat.com>
Thu, 4 Apr 2024 11:34:13 +0000 (17:04 +0530)
* 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>
1  2 
src/mds/CInode.cc
src/mds/CInode.h
src/mds/Locker.cc
src/mds/MDCache.cc

index d6ca9b31610ee5157561bd5fd512a0ff9cf44497,7c4e64de45bad9fd1cd9df5fa7ecb200b1dea2cf..33cc0b9eb28d6a708f39bc1f025e5adf488280b0
@@@ -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),
Simple merge
Simple merge
Simple merge