From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Aug 2015 17:58:05 +0000 (-0400)
Subject: mds/Server: fix check_access
X-Git-Tag: v10.0.0~123^2~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0a418ddfba860d11036809f1e9d5d9c8f7ffb4e;p=ceph.git

mds/Server: fix check_access

Pass through correct mask.  Clean up formatting.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index ae0be866dc0f..0d1b082cbda5 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -2107,8 +2107,12 @@ void Server::handle_slave_auth_pin_ack(MDRequestRef& mdr, MMDSSlaveRequest *ack)
  */
 bool Server::check_access(MDRequestRef& mdr, CInode *in, unsigned mask)
 {
- if (!mdr->session->check_access(in, MAY_WRITE, mdr->client_request->get_caller_uid(), mdr->client_request->get_caller_gid(),
-        mdr->client_request->head.args.setattr.uid, mdr->client_request->head.args.setattr.gid)){
+ if (!mdr->session->check_access(
+     in, mask,
+     mdr->client_request->get_caller_uid(),
+     mdr->client_request->get_caller_gid(),
+     mdr->client_request->head.args.setattr.uid,
+     mdr->client_request->head.args.setattr.gid)) {
     respond_to_request(mdr, -EACCES);
     return false;
   }