From: Greg Farnum <gfarnum@redhat.com>
Date: Wed, 3 Aug 2016 21:16:10 +0000 (-0700)
Subject: client: remove now-unused uid-based may_* functions
X-Git-Tag: v11.0.1~36^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a81d962a0ad908ff98626ffb9607c38053a5ae93;p=ceph.git

client: remove now-unused uid-based may_* functions

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 7cb5794f799e..915a2d8bd787 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -9899,7 +9899,7 @@ int Client::_getxattr(InodeRef &in, const char *name, void *value, size_t size,
 		      const UserPerm& perms)
 {
   if (cct->_conf->client_permissions) {
-    int r = xattr_permission(in.get(), name, MAY_READ);
+    int r = xattr_permission(in.get(), name, MAY_READ, perms);
     if (r < 0)
       return r;
   }
diff --git a/src/client/Client.h b/src/client/Client.h
index d93ec4a6a9eb..dd9e95bab65b 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -870,49 +870,6 @@ private:
     init_groups(&groups);
     return inode_permission(in, perms.uid(), groups, want);
   }
-  int xattr_permission(Inode *in, const char *name, unsigned want, int uid=-1, int gid=-1) {
-    if (uid < 0) uid = get_uid();
-    if (gid < 0) gid = get_gid();
-    UserPerm perms(uid, gid);
-    return xattr_permission(in, name, want, perms);
-  }
-
-  int may_setattr(Inode *in, struct stat *st, int mask, int uid=-1, int gid=-1) {
-    if (uid < 0) uid = get_uid();
-    if (gid < 0) gid = get_gid();
-    UserPerm perms(uid, gid);
-    return may_setattr(in, st, mask, perms);
-  }
-  int may_open(Inode *in, int flags, int uid=-1, int gid=-1) {
-    if (uid < 0) uid = get_uid();
-    if (gid < 0) gid = get_gid();
-    UserPerm perms(uid, gid);
-    return may_open(in, flags, perms);
-  }
-  int may_lookup(Inode *dir, int uid=-1, int gid=-1) {
-    if (uid < 0) uid = get_uid();
-    if (gid < 0) gid = get_gid();
-    UserPerm perms(uid, gid);
-    return may_lookup(dir, perms);
-  }
-  int may_create(Inode *dir, int uid=-1, int gid=-1) {
-    if (uid < 0) uid = get_uid();
-    if (gid < 0) gid = get_gid();
-    UserPerm perms(uid, gid);
-    return may_create(dir, perms);
-  }
-  int may_delete(Inode *dir, const char *name, int uid=-1, int gid=-1) {
-    if (uid < 0) uid = get_uid();
-    if (gid < 0) gid = get_gid();
-    UserPerm perms(uid, gid);
-    return may_delete(dir, name, perms);
-  }
-  int may_hardlink(Inode *in, int uid=-1, int gid=-1) {
-    if (uid < 0) uid = get_uid();
-    if (gid < 0) gid = get_gid();
-    UserPerm perms(uid, gid);
-    return may_hardlink(in, perms);
-  }
 
   int _getattr_for_perm(Inode *in, const UserPerm& perms);
   int _getgrouplist(gid_t **sgids, int uid, int gid);