From: Sage Weil <sage@redhat.com>
Date: Tue, 21 Jul 2015 16:50:24 +0000 (-0400)
Subject: mds/Server: clean up check_access a bit
X-Git-Tag: v10.0.0~123^2~63
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9aa6128e34f720a6a84841941155796f397e12f5;p=ceph.git

mds/Server: clean up check_access a bit

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

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index fce3760ca207..d34f8f8372fa 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -2111,18 +2111,13 @@ bool Server::check_access(MDRequestRef& mdr, CInode *in, unsigned mask)
 
   uid_t uid = mdr->client_request->get_caller_uid();
 
-  // FIXME: generate a real path
   // FIXME: behave with inodes in stray dir
   // FIXME: behave with hard links
   string path;
-
-  //path calculation
   in->make_path_string(path, false, in->get_projected_parent_dn());
+  if (path.length())
+    path = path.substr(1);    // drop leading /
 
-  //drop leading /
-  if (path.length()) path = path.substr(1);
-
-  // FIXME: it depends on the inode!
   if (s->auth_caps.is_capable(path, in->inode.uid, in->inode.gid, in->inode.mode,
 			      uid, mask)) {
     return true;