aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Dryomov <ilya.dryomov@inktank.com>2014-01-27 10:40:19 -0500
committerIlya Dryomov <ilya.dryomov@inktank.com>2014-01-27 16:57:40 -0500
commitce7f6a2790464047199f54b66420243d433142bd (patch)
tree0d6dcda977b09de07607382a4687b2ac2e6f7914
parent1b3f2ab51095a7aab684bf9f5c14235126188dbc (diff)
libceph: add ceph_pg_pool_by_id()
"Lookup pool info by ID" function is hidden in osdmap.c. Expose it to the rest of libceph. Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
-rw-r--r--include/linux/ceph/osdmap.h3
-rw-r--r--net/ceph/osdmap.c5
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index ebb8ec285de6..7f894a64c6c7 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -174,6 +174,9 @@ extern int ceph_calc_pg_acting(struct ceph_osdmap *osdmap,
174extern int ceph_calc_pg_primary(struct ceph_osdmap *osdmap, 174extern int ceph_calc_pg_primary(struct ceph_osdmap *osdmap,
175 struct ceph_pg pgid); 175 struct ceph_pg pgid);
176 176
177extern struct ceph_pg_pool_info *ceph_pg_pool_by_id(struct ceph_osdmap *map,
178 u64 id);
179
177extern const char *ceph_pg_pool_name_by_id(struct ceph_osdmap *map, u64 id); 180extern const char *ceph_pg_pool_name_by_id(struct ceph_osdmap *map, u64 id);
178extern int ceph_pg_poolid_by_name(struct ceph_osdmap *map, const char *name); 181extern int ceph_pg_poolid_by_name(struct ceph_osdmap *map, const char *name);
179 182
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index 768dd04eb9b1..d69d23556f0c 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -464,6 +464,11 @@ static struct ceph_pg_pool_info *__lookup_pg_pool(struct rb_root *root, u64 id)
464 return NULL; 464 return NULL;
465} 465}
466 466
467struct ceph_pg_pool_info *ceph_pg_pool_by_id(struct ceph_osdmap *map, u64 id)
468{
469 return __lookup_pg_pool(&map->pg_pools, id);
470}
471
467const char *ceph_pg_pool_name_by_id(struct ceph_osdmap *map, u64 id) 472const char *ceph_pg_pool_name_by_id(struct ceph_osdmap *map, u64 id)
468{ 473{
469 struct ceph_pg_pool_info *pi; 474 struct ceph_pg_pool_info *pi;