From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 30 Jan 2020 15:20:11 +0000 (-0800)
Subject: Merge PR #30969 into master
X-Git-Tag: v15.1.1~605
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc7a069ce84434685a3681002cdb3acad9b8352c;p=ceph.git

Merge PR #30969 into master

* refs/pull/30969/head:
	mds : clean up data written to unsafe inodes

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

dc7a069ce84434685a3681002cdb3acad9b8352c
diff --cc src/mds/Server.h
index 705f1bf1a5dc,023c9f0b38ab..cc43b732e465
--- a/src/mds/Server.h
+++ b/src/mds/Server.h
@@@ -125,10 -152,11 +126,10 @@@ public
    void finish_flush_session(Session *session, version_t seq);
    void terminate_sessions();
    void find_idle_sessions();
-   void kill_session(Session *session, Context *on_safe);
+   void kill_session(Session *session, Context *on_safe, bool need_purge_inos = false);
    size_t apply_blacklist(const std::set<entity_addr_t> &blacklist);
-   void journal_close_session(Session *session, int state, Context *on_safe);
+   void journal_close_session(Session *session, int state, Context *on_safe, bool need_purge_inos = false);
  
 -  set<client_t> client_reclaim_gather;
    size_t get_num_pending_reclaim() const { return client_reclaim_gather.size(); }
    Session *find_session_by_uuid(std::string_view uuid);
    void reclaim_session(Session *session, const cref_t<MClientReclaim> &m);