From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 2 Aug 2016 02:55:36 +0000 (-0700)
Subject: client: use Fh::actor_perm for _write()
X-Git-Tag: v11.0.1~36^2~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3aeca21f90950196cf959e3e79de6cd6ac630b4a;p=ceph.git

client: use Fh::actor_perm for _write()

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

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 9153ca086b4b..77ed6ef6726a 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -8463,6 +8463,7 @@ int Client::_write(Fh *f, int64_t offset, uint64_t size, const char *buf,
 
   // check quota
   uint64_t endoff = offset + size;
+  UserPerm perms(f->actor_uid, f->actor_gid); //
   if (endoff > in->size && is_quota_bytes_exceeded(in, endoff - in->size))
     return -EDQUOT;
 
@@ -8474,9 +8475,7 @@ int Client::_write(Fh *f, int64_t offset, uint64_t size, const char *buf,
      * change out from under us.
      */
     if (f->flags & O_APPEND) {
-      // FIXME
-      UserPerm perms(0, 0);
-      int r = _lseek(f, 0, SEEK_END, perms);
+      int r = _lseek(f, 0, SEEK_END, f->perms);
       if (r < 0) {
         unlock_fh_pos(f);
         return r;