From: Greg Farnum <gfarnum@redhat.com>
Date: Wed, 3 Aug 2016 21:17:26 +0000 (-0700)
Subject: client: remove get_(uid|gid) functions
X-Git-Tag: v11.0.1~36^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=876c58e9f6e3dcb409daadecbc09a50a9033c7d8;p=ceph.git

client: remove get_(uid|gid) functions

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

diff --git a/src/client/Client.h b/src/client/Client.h
index dd9e95bab65b..c94517f13db6 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -294,7 +294,9 @@ public:
   void tick();
 
   UserPerm pick_my_perms() {
-    return UserPerm(get_uid(), get_gid());
+    uid_t uid = user_id >= 0 ? user_id : ::geteuid();
+    gid_t gid = group_id >= 0 ? group_id : ::getegid();
+    return UserPerm(uid, gid);
   }
 
 protected:
@@ -305,17 +307,6 @@ protected:
   int user_id, group_id;
   int acl_type;
 
-  int get_uid() {
-    if (user_id >= 0)
-      return user_id;
-    return ::geteuid();
-  }
-  int get_gid() {
-    if (group_id >= 0)
-      return group_id;
-    return ::getegid();
-  }
-
   void set_cap_epoch_barrier(epoch_t e);
   epoch_t cap_epoch_barrier;