From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 24 Oct 2016 14:03:00 +0000 (-0400)
Subject: client: convert ceph_ll_opendir to UserPerm
X-Git-Tag: v11.1.0~383^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6a2930abbb0f3fd1599485d6676b7b0f2dc6539b;p=ceph.git

client: convert ceph_ll_opendir to UserPerm

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/src/include/cephfs/libcephfs.h b/src/include/cephfs/libcephfs.h
index 39582af51138..746c5c797006 100644
--- a/src/include/cephfs/libcephfs.h
+++ b/src/include/cephfs/libcephfs.h
@@ -1493,7 +1493,7 @@ int ceph_ll_link(struct ceph_mount_info *cmount, struct Inode *in,
 		 struct Inode *newparent, const char *name,
 		 const UserPerm *perms);
 int ceph_ll_opendir(struct ceph_mount_info *cmount, struct Inode *in,
-		    struct ceph_dir_result **dirpp, int uid, int gid);
+		    struct ceph_dir_result **dirpp, const UserPerm *perms);
 int ceph_ll_releasedir(struct ceph_mount_info *cmount,
 		       struct ceph_dir_result* dir);
 int ceph_ll_rename(struct ceph_mount_info *cmount, struct Inode *parent,
diff --git a/src/libcephfs.cc b/src/libcephfs.cc
index dd2e648afc95..664fb809fd8e 100644
--- a/src/libcephfs.cc
+++ b/src/libcephfs.cc
@@ -1576,11 +1576,10 @@ extern "C" int ceph_ll_link(class ceph_mount_info *cmount,
 extern "C" int ceph_ll_opendir(class ceph_mount_info *cmount,
 			       Inode *in,
 			       struct ceph_dir_result **dirpp,
-			       int uid, int gid)
+			       const UserPerm *perms)
 {
-  UserPerm perms(uid, gid);
   return (cmount->get_client()->ll_opendir(in, O_RDONLY, (dir_result_t**) dirpp,
-					   perms));
+					   *perms));
 }
 
 extern "C" int ceph_ll_releasedir(class ceph_mount_info *cmount,