From: Greg Farnum <gfarnum@redhat.com>
Date: Thu, 28 Jul 2016 18:42:43 +0000 (-0700)
Subject: client: generate UserPerm _open and _create variants
X-Git-Tag: v11.0.1~36^2~72
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94bac72f44b700cc612a368f351c24cd52ce3362;p=ceph.git

client: generate UserPerm _open and _create variants

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

diff --git a/src/client/Client.h b/src/client/Client.h
index ebf9bbae343d..d10233d18f07 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -827,10 +827,20 @@ private:
   int _removexattr(Inode *in, const char *nm, const UserPerm& perms);
   int _removexattr(InodeRef &in, const char *nm, const UserPerm& perms);
   int _open(Inode *in, int flags, mode_t mode, Fh **fhp, int uid, int gid);
+  int _open(Inode *in, int flags, mode_t mode, Fh **fhp,
+	    const UserPerm& perms) {
+    return _open(in, flags, mode, fhp, perms.uid(), perms.gid());
+  }
   int _renew_caps(Inode *in);
   int _create(Inode *in, const char *name, int flags, mode_t mode, InodeRef *inp, Fh **fhp,
               int stripe_unit, int stripe_count, int object_size, const char *data_pool,
 	      bool *created, int uid, int gid);
+  int _create(Inode *in, const char *name, int flags, mode_t mode, InodeRef *inp,
+	      Fh **fhp, int stripe_unit, int stripe_count, int object_size,
+	      const char *data_pool, bool *created, const UserPerm &perms) {
+    return _create(in, name, flags, mode, inp, fhp, stripe_unit, stripe_count,
+	    object_size, data_pool, created, perms.uid(), perms.gid());
+  }
 
   loff_t _lseek(Fh *fh, loff_t offset, int whence);
   loff_t _lseek(Fh *fh, loff_t offset, int whence, const UserPerm& perms);