From: Greg Farnum <gfarnum@redhat.com>
Date: Wed, 3 Aug 2016 06:34:58 +0000 (-0700)
Subject: client: call _getattr() with UserPerm in posix checkers
X-Git-Tag: v11.0.1~36^2~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d7740fca42e2f20cbc61230b4a19708313bb2ccf;p=ceph.git

client: call _getattr() with UserPerm in posix checkers

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

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 345b6f9c352..5f865900874 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -12381,8 +12381,7 @@ int Client::_posix_acl_chmod(Inode *in, mode_t mode, const UserPerm& perms)
   if (acl_type == NO_ACL)
     return 0;
 
-  int r = _getattr(in, CEPH_STAT_CAP_XATTR, perms.uid(), perms.gid(),
-		   in->xattr_version == 0);
+  int r = _getattr(in, CEPH_STAT_CAP_XATTR, perms, in->xattr_version == 0);
   if (r < 0)
     goto out;
 
@@ -12412,7 +12411,7 @@ int Client::_posix_acl_create(Inode *dir, mode_t *mode, bufferlist& xattrs_bl,
   if (S_ISLNK(*mode))
     return 0;
 
-  int r = _getattr(dir, CEPH_STAT_CAP_XATTR, perms.uid(), perms.gid(), dir->xattr_version == 0);
+  int r = _getattr(dir, CEPH_STAT_CAP_XATTR, perms, dir->xattr_version == 0);
   if (r < 0)
     goto out;