RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-20 01:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #31716 into master

Browse Source 
* refs/pull/31716/head:
	mds: Reorganize class members in ScatterLock header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2019-12-11 09:40:25 -08:00
commit 2399be4a70
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/mds/ScatterLock.h
View File

@ -21,32 +21,6 @@
#include "MDSContext.h" #include "MDSContext.h"
class ScatterLock : public SimpleLock { class ScatterLock : public SimpleLock {
struct more_bits_t {
xlist<ScatterLock*>::item item_updated;
utime_t update_stamp;
explicit more_bits_t(ScatterLock *lock) :
item_updated(lock)
{}
};
mutable std::unique_ptr<more_bits_t> _more;
more_bits_t *more() {
if (!_more)
_more.reset(new more_bits_t(this));
return _more.get();
}
enum {
SCATTER_WANTED = 1 << 8,
UNSCATTER_WANTED = 1 << 9,
DIRTY = 1 << 10,
FLUSHING = 1 << 11,
FLUSHED = 1 << 12,
};
public: public:
ScatterLock(MDSCacheObject *o, LockType *lt) : ScatterLock(MDSCacheObject *o, LockType *lt) :
SimpleLock(o, lt) {} SimpleLock(o, lt) {}
@ -231,6 +205,29 @@ public:
} }
private: private:
struct more_bits_t {
xlist<ScatterLock*>::item item_updated;
utime_t update_stamp;
explicit more_bits_t(ScatterLock *lock) :
item_updated(lock)
{}
};
more_bits_t *more() {
if (!_more)
_more.reset(new more_bits_t(this));
return _more.get();
}
enum {
SCATTER_WANTED = 1 << 8,
UNSCATTER_WANTED = 1 << 9,
DIRTY = 1 << 10,
FLUSHING = 1 << 11,
FLUSHED = 1 << 12,
};
void set_flushing() { void set_flushing() {
state_flags |= FLUSHING; state_flags |= FLUSHING;
} }
@ -250,6 +247,8 @@ private:
_more.reset(); _more.reset();
} }
} }
mutable std::unique_ptr<more_bits_t> _more;
}; };
#endif #endif