client: check xattr version independent of inode version

Fixes: #10343
Signed-off-by: Yan, Zheng <zyan@redhat.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 1c305510a7162872163c6d4a97f785063a242aa5..53e225c47a952557cd2b4688a9f0f5b2dc686fb2 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -792,14 +792,6 @@ Inode * Client::add_update_inode(InodeStat *st, utime_t from,
       in->nlink = st->nlink;
     }
 
-    if ((in->xattr_version  == 0 || !(issued & CEPH_CAP_XATTR_EXCL)) &&
-       st->xattrbl.length() &&
-       st->xattr_version > in->xattr_version) {
-      bufferlist::iterator p = st->xattrbl.begin();
-      ::decode(in->xattrs, p);
-      in->xattr_version = st->xattr_version;
-    }
-
     in->dirstat = st->dirstat;
     in->rstat = st->rstat;
 
@@ -823,6 +815,14 @@ Inode * Client::add_update_inode(InodeStat *st, utime_t from,
     in->inline_version = st->inline_version;
   }
 
+  if ((in->xattr_version  == 0 || !(issued & CEPH_CAP_XATTR_EXCL)) &&
+      st->xattrbl.length() &&
+      st->xattr_version > in->xattr_version) {
+    bufferlist::iterator p = st->xattrbl.begin();
+    ::decode(in->xattrs, p);
+    in->xattr_version = st->xattr_version;
+  }
+
   // move me if/when version reflects fragtree changes.
   if (in->dirfragtree != st->dirfragtree) {
     in->dirfragtree = st->dirfragtree;