]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
client: use Fh::actor_perm for _write()
authorGreg Farnum <gfarnum@redhat.com>
Tue, 2 Aug 2016 02:55:36 +0000 (19:55 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Wed, 21 Sep 2016 23:33:52 +0000 (16:33 -0700)
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
src/client/Client.cc

index 9153ca086b4bac182c07609aad8ec24ab847872f..77ed6ef6726a94c504a5919533d0296414ce046c 100644 (file)
@@ -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;