diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 12:18:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 12:18:32 -0400 |
| commit | 682c30ed2165d5694a414d31eac7c63ac5700fb0 (patch) | |
| tree | 0dd5c95637222f05f3f89511453387b03c85f6f4 /fs/ceph/mdsmap.h | |
| parent | 84479f3c17e2c452d22be10a967e5282b3742d9f (diff) | |
| parent | e56fa10e92e077d456cbc33b7025032887772b33 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (39 commits)
ceph: generalize mon requests, add pool op support
ceph: only queue async writeback on cap revocation if there is dirty data
ceph: do not ignore osd_idle_ttl mount option
ceph: constify dentry_operations
ceph: whitespace cleanup
ceph: add flock/fcntl lock support
ceph: define on-wire types, constants for file locking support
ceph: add CEPH_FEATURE_FLOCK to the supported feature bits
ceph: support v2 reconnect encoding
ceph: support v2 client_caps encoding
ceph: move AES iv definition to shared header
ceph: fix decoding of pool snap info
ceph: make ->sync_fs not wait if wait==0
ceph: warn on missing snap realm
ceph: print useful error message when crush rule not found
ceph: use %pU to print uuid (fsid)
ceph: sync header defs with server code
ceph: clean up header guards
ceph: strip misleading/obsolete version, feature info
ceph: specify supported features in super.h
...
Diffstat (limited to 'fs/ceph/mdsmap.h')
| -rw-r--r-- | fs/ceph/mdsmap.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/ceph/mdsmap.h b/fs/ceph/mdsmap.h index eacc131aa5cb..4c5cb0880bba 100644 --- a/fs/ceph/mdsmap.h +++ b/fs/ceph/mdsmap.h | |||
| @@ -13,6 +13,7 @@ struct ceph_mds_info { | |||
| 13 | struct ceph_entity_addr addr; | 13 | struct ceph_entity_addr addr; |
| 14 | s32 state; | 14 | s32 state; |
| 15 | int num_export_targets; | 15 | int num_export_targets; |
| 16 | bool laggy; | ||
| 16 | u32 *export_targets; | 17 | u32 *export_targets; |
| 17 | }; | 18 | }; |
| 18 | 19 | ||
| @@ -47,6 +48,13 @@ static inline int ceph_mdsmap_get_state(struct ceph_mdsmap *m, int w) | |||
| 47 | return m->m_info[w].state; | 48 | return m->m_info[w].state; |
| 48 | } | 49 | } |
| 49 | 50 | ||
| 51 | static inline bool ceph_mdsmap_is_laggy(struct ceph_mdsmap *m, int w) | ||
| 52 | { | ||
| 53 | if (w >= 0 && w < m->m_max_mds) | ||
| 54 | return m->m_info[w].laggy; | ||
| 55 | return false; | ||
| 56 | } | ||
| 57 | |||
| 50 | extern int ceph_mdsmap_get_random_mds(struct ceph_mdsmap *m); | 58 | extern int ceph_mdsmap_get_random_mds(struct ceph_mdsmap *m); |
| 51 | extern struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end); | 59 | extern struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end); |
| 52 | extern void ceph_mdsmap_destroy(struct ceph_mdsmap *m); | 60 | extern void ceph_mdsmap_destroy(struct ceph_mdsmap *m); |