Merging upstream version 18.2.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 16 insertions, 0 deletions

diff --git a/src/client/Inode.cc b/src/client/Inode.cc
index 0c19bef5e..cb30d4940 100644
--- a/src/client/Inode.cc
+++ b/src/client/Inode.cc
@@ -120,6 +120,22 @@ void Inode::make_short_path(filepath& p)
 }
 
 /*
+ * make a filepath suitable for mds auth access check:
+ */
+bool Inode::make_path_string(std::string& s)
+{
+  if (client->_get_root_ino(false) == ino) {
+    return true;
+  } else if (!dentries.empty()) {
+    Dentry *dn = get_first_parent();
+    ceph_assert(dn->dir && dn->dir->parent_inode);
+    return dn->make_path_string(s);
+  }
+
+  return false;
+}
+
+/*
  * make a filepath suitable for an mds request:
  *  - if we are non-snapped/live, the ino is sufficient, e.g. #1234
  *  - if we are snapped, make filepath relative to first non-snapped parent.