diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 10:12:41 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 10:12:41 -0700 |
| commit | 8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch) | |
| tree | 5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /fs/ceph/osdmap.h | |
| parent | 30ba3ead05763b172acaa65ae1be71af2a878940 (diff) | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
| download | kernel_samsung_tuna-8d0bc2b456103a34c11e01305cd1aed1cde579e5.zip kernel_samsung_tuna-8d0bc2b456103a34c11e01305cd1aed1cde579e5.tar.gz kernel_samsung_tuna-8d0bc2b456103a34c11e01305cd1aed1cde579e5.tar.bz2 | |
Merge commit 'v2.6.34' into next
Diffstat (limited to 'fs/ceph/osdmap.h')
| -rw-r--r-- | fs/ceph/osdmap.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ceph/osdmap.h b/fs/ceph/osdmap.h index 1fb55af..970b547 100644 --- a/fs/ceph/osdmap.h +++ b/fs/ceph/osdmap.h @@ -23,6 +23,7 @@ struct ceph_pg_pool_info { int id; struct ceph_pg_pool v; int pg_num_mask, pgp_num_mask, lpg_num_mask, lpgp_num_mask; + char *name; }; struct ceph_pg_mapping { @@ -119,6 +120,8 @@ extern int ceph_calc_object_layout(struct ceph_object_layout *ol, const char *oid, struct ceph_file_layout *fl, struct ceph_osdmap *osdmap); +extern int ceph_calc_pg_acting(struct ceph_osdmap *osdmap, struct ceph_pg pgid, + int *acting); extern int ceph_calc_pg_primary(struct ceph_osdmap *osdmap, struct ceph_pg pgid); |