From: Yan, Zheng <ukernel@gmail.com>
Date: Sat, 2 Jun 2018 01:06:54 +0000 (+0800)
Subject: Merge branch 'luminous' into wip-23704-luminous
X-Git-Tag: v12.2.6~65^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21475%2Fhead;p=ceph.git

Merge branch 'luminous' into wip-23704-luminous
---

820cb1f958d3787f2f4cfab585e31e70da2e1d91
diff --cc src/client/Client.h
index 2b6fd001ebcc,72e5ca1e5bcc..8cbc661adc8f
--- a/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,