diff options
| author | Yan, Zheng <zyan@redhat.com> | 2017-07-31 15:12:25 +0200 |
|---|---|---|
| committer | Yan, Zheng <zyan@redhat.com> | 2018-02-09 11:41:27 +0100 |
| commit | 34682e447522b94068425b761772d6a52634477c (patch) | |
| tree | 0fbbba64fb915c9f82cfc50d87a605fc531ebead /src/mds/SnapRealm.h | |
| parent | mds: send updated snaprealms along with slave requests (diff) | |
| download | ceph-34682e447522b94068425b761772d6a52634477c.tar.xz ceph-34682e447522b94068425b761772d6a52634477c.zip | |
mds: rollback snaprealms when rolling back slave request
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Diffstat (limited to 'src/mds/SnapRealm.h')
| -rw-r--r-- | src/mds/SnapRealm.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mds/SnapRealm.h b/src/mds/SnapRealm.h index 7abe656bae7..cbbe6abb460 100644 --- a/src/mds/SnapRealm.h +++ b/src/mds/SnapRealm.h @@ -148,7 +148,7 @@ public: void adjust_parent(); void split_at(SnapRealm *child); - void join(SnapRealm *child); + void merge_to(SnapRealm *newparent); void add_cap(client_t client, Capability *cap) { auto client_caps_entry = client_caps.find(client); @@ -164,7 +164,6 @@ public: client_caps.erase(client); } } - }; ostream& operator<<(ostream& out, const SnapRealm &realm); |