@@ -3643,10 +3643,9 @@ static ssize_t rbd_add(struct bus_type *bus,
/* pick the pool */
osdc = &rbdc->client->osdc;
- rc = ceph_pg_poolid_by_name(osdc->osdmap, spec->pool_name);
- if (rc < 0)
+ spec->pool_id = ceph_pg_pool_id_by_name(osdc->osdmap, spec->pool_name);
+ if (spec->pool_id == CEPH_NOPOOL)
goto err_out_client;
- spec->pool_id = (u64) rc;
rbd_dev = rbd_dev_create(rbdc, spec);
if (!rbd_dev)
@@ -124,6 +124,6 @@ extern int ceph_calc_pg_primary(struct ceph_osdmap
*osdmap,
struct ceph_pg pgid);
extern const char *ceph_pg_pool_name_by_id(struct ceph_osdmap *map, u64
id);
-extern int ceph_pg_poolid_by_name(struct ceph_osdmap *map, const char
*name);
+extern __u64 ceph_pg_pool_id_by_name(struct ceph_osdmap *map, const
char *name);
#endif
@@ -485,19 +485,21 @@ const char *ceph_pg_pool_name_by_id(struct
ceph_osdmap *map, u64 id)
}
EXPORT_SYMBOL(ceph_pg_pool_name_by_id);
-int ceph_pg_poolid_by_name(struct ceph_osdmap *map, const char *name)
+__u64 ceph_pg_pool_id_by_name(struct ceph_osdmap *map, const char *name)
{
struct rb_node *rbp;
for (rbp = rb_first(&map->pg_pools); rbp; rbp = rb_next(rbp)) {
- struct ceph_pg_pool_info *pi =
- rb_entry(rbp, struct ceph_pg_pool_info, node);
+ struct ceph_pg_pool_info *pi;
+
+ pi = rb_entry(rbp, struct ceph_pg_pool_info, node);
if (pi->name && strcmp(pi->name, name) == 0)
- return pi->id;
+ return (__u64) pi->id;
}
- return -ENOENT;
+
+ return CEPH_NOPOOL;
}
-EXPORT_SYMBOL(ceph_pg_poolid_by_name);
+EXPORT_SYMBOL(ceph_pg_pool_id_by_name);
static void __remove_pg_pool(struct rb_root *root, struct
Currently ceph_pg_poolid_by_name() returns an int, which is used to encode a ceph pool id. This could be a problem because a pool id (at least in some cases) is a 64-bit value. We have a defined pool id value that represents "no pool," and that's a very sensible return value here. This patch changes ceph_pg_poolid_by_name() to return a 64-bit pool id value, or CEPH_NOPOOL if the named pool is not found. The patch also gratuitously renames the function, separating "pool" from "id" in the name by an underscore. Signed-off-by: Alex Elder <elder@inktank.com> --- drivers/block/rbd.c | 5 ++--- include/linux/ceph/osdmap.h | 2 +- net/ceph/osdmap.c | 14 ++++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) ceph_pg_pool_info *pi) {