From 459c745a707829e90dfd22aefa838d66b4fa21fa Mon Sep 17 00:00:00 2001 From: John Spray Date: Mon, 19 Dec 2016 12:41:08 +0000 Subject: [PATCH] mds: const snaprealm getters on CInode Signed-off-by: John Spray --- src/mds/CInode.cc | 4 ++-- src/mds/CInode.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index a2246f3d31b..5bb61899aff 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -2603,9 +2603,9 @@ void CInode::close_snaprealm(bool nojoin) } } -SnapRealm *CInode::find_snaprealm() +SnapRealm *CInode::find_snaprealm() const { - CInode *cur = this; + const CInode *cur = this; while (!cur->snaprealm) { if (cur->get_parent_dn()) cur = cur->get_parent_dn()->get_dir()->get_inode(); diff --git a/src/mds/CInode.h b/src/mds/CInode.h index 484aed549e0..2b7edcfcbf4 100644 --- a/src/mds/CInode.h +++ b/src/mds/CInode.h @@ -723,6 +723,7 @@ public: inode_t& get_inode() { return inode; } CDentry* get_parent_dn() { return parent; } + const CDentry* get_parent_dn() const { return parent; } const CDentry* get_projected_parent_dn() const { return !projected_parent.empty() ? projected_parent.back() : parent; } CDentry* get_projected_parent_dn() { return !projected_parent.empty() ? projected_parent.back() : parent; } CDir *get_parent_dir(); @@ -911,7 +912,7 @@ public: // -- snap -- void open_snaprealm(bool no_split=false); void close_snaprealm(bool no_join=false); - SnapRealm *find_snaprealm(); + SnapRealm *find_snaprealm() const; void encode_snap(bufferlist& bl); void decode_snap(bufferlist::iterator& p); -- 2.47.3