From 394d313c53ad2c799ef8f16c6e43930f56c52393 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 15 Apr 2024 21:12:51 -0400 Subject: [PATCH] mds: encode flags for all inode types Inode flag F_QUIESCE_BLOCK would not be encoded for regular files. Unfortunately we're encoding the value twice for directories but it's a small overhead. Fixes: https://tracker.ceph.com/issues/65518 Fixes: fb05dd1806fc0edf2e4c0908aae114d57099a6d6 Fixes: e2529fc74808b102b1ca85a3ee6644160da32e60 Signed-off-by: Patrick Donnelly --- src/mds/CInode.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index 33cc0b9eb28..e1570b0dced 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -2144,7 +2144,7 @@ void CInode::decode_lock_iflock(bufferlist::const_iterator& p) void CInode::encode_lock_ipolicy(bufferlist& bl) { - ENCODE_START(2, 1, bl); + ENCODE_START(3, 1, bl); if (is_dir()) { encode(get_inode()->version, bl); encode(get_inode()->ctime, bl); @@ -2153,6 +2153,8 @@ void CInode::encode_lock_ipolicy(bufferlist& bl) encode(get_inode()->export_pin, bl); encode(get_inode()->flags, bl); encode(get_inode()->export_ephemeral_random_pin, bl); + } else { + encode(get_inode()->flags, bl); } ENCODE_FINISH(bl); } @@ -2161,7 +2163,7 @@ void CInode::decode_lock_ipolicy(bufferlist::const_iterator& p) { ceph_assert(!is_auth()); auto _inode = allocate_inode(*get_inode()); - DECODE_START(1, p); + DECODE_START(3, p); if (is_dir()) { decode(_inode->version, p); utime_t tm; @@ -2175,6 +2177,10 @@ void CInode::decode_lock_ipolicy(bufferlist::const_iterator& p) decode(_inode->flags, p); decode(_inode->export_ephemeral_random_pin, p); } + } else { + if (struct_v >= 3) { + decode(_inode->flags, p); + } } DECODE_FINISH(p); -- 2.39.5