From patchwork Thu Nov 1 15:22:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1685331 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 91E1A3FE1F for ; Thu, 1 Nov 2012 15:22:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992465Ab2KAPWL (ORCPT ); Thu, 1 Nov 2012 11:22:11 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:36297 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992455Ab2KAPWK (ORCPT ); Thu, 1 Nov 2012 11:22:10 -0400 Received: by mail-ie0-f174.google.com with SMTP id k13so3718405iea.19 for ; Thu, 01 Nov 2012 08:22:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=5R0eL3nOvNmtFPO1IWL5ZRCOBkIOyLXsFmNqJ7ym00Q=; b=eWJktvrjzuxnFpPlnhnY+8vuqdY4v1gr2dbcKZZhOGEx3/hFOuKSLCMQmPsFm7K0xW A9SO2v+f22+7yITlcbS1lig8QfL5CDGx7aK1v4G3oCuICWkbcORbSnUJJCplBapm8g9D 90hARpcqauQ6t8SVtuLGp1l6OjLelDTAdY9/UJ+2ozyPSz+2mJI150H0Ge0rGjWDm1vr IxLkGuKO9JZ40nPA5jD62bNHtAns6VKy/dz5RiJQSmE4JEw74nP/ft3tzxPef138CjP2 En/z8vgQ029mph1lEXxlvLV/Xq4jBHnN4ZCWzKeE5RdOYPRSMlAH09WuEtNKyTbz0FfI eZ9Q== Received: by 10.50.190.161 with SMTP id gr1mr1651112igc.14.1351783329241; Thu, 01 Nov 2012 08:22:09 -0700 (PDT) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id wm10sm13127678igc.2.2012.11.01.08.22.00 (version=SSLv3 cipher=OTHER); Thu, 01 Nov 2012 08:22:04 -0700 (PDT) Message-ID: <50929398.8090306@inktank.com> Date: Thu, 01 Nov 2012 10:22:00 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH] rbd: fix ceph_pg_poolid_by_name() X-Gm-Message-State: ALoCoQmnrpjrtphUFt3tx9Lk4GYAjeFiR/maQ/9mH+Zyh7CQFIISLCYRHgigDWft8xLevS29bWsQ Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org 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 --- 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) { diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index cf7b405..503ee7f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -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) diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h index 5ea57ba..c841396 100644 --- a/include/linux/ceph/osdmap.h +++ b/include/linux/ceph/osdmap.h @@ -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 diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index de73214..27e904e 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -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