From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 24 Sep 2019 11:15:02 +0000 (-0700)
Subject: Merge PR #30164 into master
X-Git-Tag: v15.1.0~1445
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a968e88fb6aeb01e204186344af0f9451e351f70;p=ceph.git

Merge PR #30164 into master

* refs/pull/30164/head:
	mds: Remove unnecessary headers in Locker
	mds: Reorganize class members in Locker header

Reviewed-by: Jos Collin <jcollin@redhat.com>
---

a968e88fb6aeb01e204186344af0f9451e351f70
diff --cc src/mds/Locker.h
index ee704dbf6ae4,1bdc093a8e24..67f763180475
--- a/src/mds/Locker.h
+++ b/src/mds/Locker.h
@@@ -181,31 -136,8 +136,8 @@@ public
  
    void remove_client_cap(CInode *in, Capability *cap, bool kill=false);
  
 -  std::vector<client_t> get_late_revoking_clients(double timeout) const;
 +  std::set<client_t> get_late_revoking_clients(double timeout) const;
  
- private:
-   bool any_late_revoking_caps(xlist<Capability*> const &revoking, double timeout) const;
- 
- protected:
-   bool _need_flush_mdlog(CInode *in, int wanted_caps);
-   void adjust_cap_wanted(Capability *cap, int wanted, int issue_seq);
-   void handle_client_caps(const cref_t<MClientCaps> &m);
-   void _update_cap_fields(CInode *in, int dirty, const cref_t<MClientCaps> &m, CInode::mempool_inode *pi);
-   void _do_snap_update(CInode *in, snapid_t snap, int dirty, snapid_t follows, client_t client, const cref_t<MClientCaps> &m, const ref_t<MClientCaps> &ack);
-   void _do_null_snapflush(CInode *head_in, client_t client, snapid_t last=CEPH_NOSNAP);
-   bool _do_cap_update(CInode *in, Capability *cap, int dirty, snapid_t follows, const cref_t<MClientCaps> &m,
- 		      const ref_t<MClientCaps> &ack, bool *need_flush=NULL);
-   void handle_client_cap_release(const cref_t<MClientCapRelease> &m);
-   void _do_cap_release(client_t client, inodeno_t ino, uint64_t cap_id, ceph_seq_t mseq, ceph_seq_t seq);
-   void caps_tick();
- 
-   // Maintain a global list to quickly find if any caps are late revoking
-   xlist<Capability*> revoking_caps;
-   // Maintain a per-client list to find clients responsible for late ones quickly
-   std::map<client_t, xlist<Capability*> > revoking_caps_by_client;
- 
-   elist<CInode*> need_snapflush_inodes;
- public:
    void snapflush_nudge(CInode *in);
    void mark_need_snapflush_inode(CInode *in);
    bool is_revoking_any_caps_from(client_t client);