client: force a request to update the perms

If the caller perms is different with the current dirtier's, we
can still cache the attributes locally if possible, but will
mark the ctime needs to be updated forcely and the request will
implicitly flush the dirty caps for us.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 569770afe52726e1df970c2219b8aa2c080e8a31)

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 13dc52051b27b106f1f4fe2109d669063784934b..34b19fe4c4789fcb5056a87491b4167d69e95dbf 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -7566,9 +7566,7 @@ int Client::_do_setattr(Inode *in, struct ceph_statx *stx, int mask,
      * case later, we can build a more complex pipelined cap writeback
      * infrastructure...
      */
-    if (!mask)
-      mask |= CEPH_SETATTR_CTIME;
-    goto force_request;
+    mask |= CEPH_SETATTR_CTIME;
   }
 
   if (!mask) {
@@ -7768,7 +7766,6 @@ int Client::_do_setattr(Inode *in, struct ceph_statx *stx, int mask,
     return 0;
   }
 
-force_request:
   MetaRequest *req = new MetaRequest(CEPH_MDS_OP_SETATTR);
 
   filepath path;