Merge branch 'luminous' into wip-23704-luminous

diff --cc src/client/Client.h
index 2b6fd001ebccff0af6fd728fdd418c846580fbf2,72e5ca1e5bcc7fd6cccb0d90181722490fd1585f..8cbc661adc8f532c8f1d4dc2a26389a9e9b32dbb
--- 1/src/client/Client.h
--- 2/src/client/Client.h
+++ b/src/client/Client.h
@@@ -863,8 -861,7 +861,6 @@@ private
      MAY_READ = 4,
    };
  
-   void init_groups(UserPerm *groups);
- 
 -  int inode_permission(Inode *in, const UserPerm& perms, unsigned want);
    int xattr_permission(Inode *in, const char *name, unsigned want,
                       const UserPerm& perms);
    int may_setattr(Inode *in, struct ceph_statx *stx, int mask,

diff --cc src/client/fuse_ll.cc
Simple merge