client: convert ceph_ll_open to take a UserPerm pointer

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

diff --git a/src/include/cephfs/libcephfs.h b/src/include/cephfs/libcephfs.h
index 3c6334c35e4a48cb2dd4415cad665a8bc8c09ccd..1401371ce4c2d855f667681adb27d7528eca960a 100644 (file)
--- a/src/include/cephfs/libcephfs.h
+++ b/src/include/cephfs/libcephfs.h
@@ -1440,7 +1440,7 @@ int ceph_ll_getattr(struct ceph_mount_info *cmount, struct Inode *in,
 int ceph_ll_setattr(struct ceph_mount_info *cmount, struct Inode *in,
                    struct ceph_statx *stx, int mask, const UserPerm *perms);
 int ceph_ll_open(struct ceph_mount_info *cmount, struct Inode *in, int flags,
-                struct Fh **fh, int uid, int gid);
+                struct Fh **fh, const UserPerm *perms);
 off_t ceph_ll_lseek(struct ceph_mount_info *cmount, struct Fh* filehandle,
                     off_t offset, int whence);
 int ceph_ll_read(struct ceph_mount_info *cmount, struct Fh* filehandle,

diff --git a/src/libcephfs.cc b/src/libcephfs.cc
index 0a3fbb290910524b3f187d096131e60f47e6a20d..5b880aa2ef34e3222499c8d113c80fbf84d1eeae 100644 (file)
--- a/src/libcephfs.cc
+++ b/src/libcephfs.cc
@@ -1445,10 +1445,9 @@ extern "C" int ceph_ll_setattr(class ceph_mount_info *cmount,
 }
 
 extern "C" int ceph_ll_open(class ceph_mount_info *cmount, Inode *in,
-                           int flags, Fh **fh, int uid, int gid)
+                           int flags, Fh **fh, const UserPerm *perms)
 {
-  UserPerm perms(uid, gid);
-  return (cmount->get_client()->ll_open(in, flags, fh, perms));
+  return (cmount->get_client()->ll_open(in, flags, fh, *perms));
 }
 
 extern "C" int ceph_ll_read(class ceph_mount_info *cmount, Fh* filehandle,