From d3cad9bdc26c38cbd2ab7af19e7dc0c57fe1954d Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Tue, 2 Aug 2016 23:17:41 -0700 Subject: [PATCH] client: use Fh::actor_perms for _read() and _write() Signed-off-by: Greg Farnum --- src/client/Client.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 3dd713e68bb..a4ee8164b62 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -8068,7 +8068,7 @@ int Client::_read(Fh *f, int64_t offset, uint64_t size, bufferlist *bl) loff_t start_pos = offset; if (in->inline_version == 0) { - int r = _getattr(in, CEPH_STAT_CAP_INLINE_DATA, -1, -1, true); + int r = _getattr(in, CEPH_STAT_CAP_INLINE_DATA, f->actor_perms, true); if (r < 0) return r; assert(in->inline_version > 0); @@ -8142,7 +8142,7 @@ retry: put_cap_ref(in, CEPH_CAP_FILE_RD); have = 0; // reverify size - r = _getattr(in, CEPH_STAT_CAP_SIZE); + r = _getattr(in, CEPH_STAT_CAP_SIZE, f->actor_perms); if (r < 0) goto done; @@ -8475,7 +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) { - int r = _lseek(f, 0, SEEK_END, f->perms); + int r = _lseek(f, 0, SEEK_END, f->actor_perms); if (r < 0) { unlock_fh_pos(f); return r; @@ -8494,7 +8494,7 @@ int Client::_write(Fh *f, int64_t offset, uint64_t size, const char *buf, utime_t start = ceph_clock_now(cct); if (in->inline_version == 0) { - int r = _getattr(in, CEPH_STAT_CAP_INLINE_DATA, -1, -1, true); + int r = _getattr(in, CEPH_STAT_CAP_INLINE_DATA, f->actor_perms, true); if (r < 0) return r; assert(in->inline_version > 0); -- 2.47.3