From patchwork Wed Aug 24 13:18:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 9297701 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3D967607F0 for ; Wed, 24 Aug 2016 13:20:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C64728EC1 for ; Wed, 24 Aug 2016 13:20:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C6FC28FD7; Wed, 24 Aug 2016 13:20:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE8A928EC1 for ; Wed, 24 Aug 2016 13:20:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754320AbcHXNUA (ORCPT ); Wed, 24 Aug 2016 09:20:00 -0400 Received: from mail-yb0-f195.google.com ([209.85.213.195]:36520 "EHLO mail-yb0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753073AbcHXNT6 (ORCPT ); Wed, 24 Aug 2016 09:19:58 -0400 Received: by mail-yb0-f195.google.com with SMTP id f60so443591ybi.3 for ; Wed, 24 Aug 2016 06:18:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=EHo1rpFeysdrCAMIOfifFUWZGqwfQg4nZI7uoJ96eYE=; b=RAf4odz1RN7HAq2rhr/N5AF1vHMxszG7NSwYvQ008EYSPI1DMuzbjvZuDmiOQ+wdEJ 78p6i2/aj68N+BwzoKAkPSpc7rtwTOZ9hgckzM0EAvLz3M1l3hM+MfKp1u1n0rxt5g/s 6D4mNOjpHChpza4/IGTMB2tt6KGFUNh8TqY7iZRgLANWMPvro9VvuqcI9QaFudO4H0vu P/o29TocNMFMp8IEPZTkHh3n8e+fbQNTIXwJxKZwrv0IUbkJ1aX+uEFInkFNHB0MysZd MS2qC3A2wfmCGRqVlTJknWJ2sZ5qYbqfFpkG59rVK8w9J7poZGDw2nCuBlDBNFRGQzpi rENw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=EHo1rpFeysdrCAMIOfifFUWZGqwfQg4nZI7uoJ96eYE=; b=ib02E+OdtnUUwcK/okC2bh2Ud98MX14MRqO7XhguDyqf/xCry3TFfNuv6APlqT3WI6 nbXFAoZdeXR+y+XP0qa5Bfj4dp1d8qvz4Y2FCf1zLke9JsdTCysbDPWmPdeCEEEtPwwm mNdAXV5a+qy3/ji4k3EpyEdRUqsfpiEZIMG/C3jGtoNoCyK+An3CnEXxxITNnqZgpDMa Y4FDWDJMisaqkinotef9rXViUH0p8HBXHuRM9H/yr3W8FJKoVQgmHxYzRVDaSJUNxYNk yTWnJu4XnsZWYL7zcGNj6V628U5qWN0976WpY2taLY0GJwrYn+r1DH2gsnWuG4iGVr9N Jutw== X-Gm-Message-State: AEkoouvk0z55GaqCHRhQOPZoA9bwY9Y1ZiQL+jqATCHyACjJDSdrCtI01h1knNi2BOx70w== X-Received: by 10.37.35.7 with SMTP id j7mr2290530ybj.125.1472044738785; Wed, 24 Aug 2016 06:18:58 -0700 (PDT) Received: from dhcp-1-219.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id e197sm5371294ywa.16.2016.08.24.06.18.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2016 06:18:58 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 07/16] libceph: rename ceph_client_id() -> ceph_client_gid() Date: Wed, 24 Aug 2016 15:18:31 +0200 Message-Id: <1472044720-29116-8-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1472044720-29116-1-git-send-email-idryomov@gmail.com> References: <1472044720-29116-1-git-send-email-idryomov@gmail.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- drivers/block/rbd.c | 2 +- include/linux/ceph/libceph.h | 2 +- net/ceph/ceph_common.c | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 6c6519f6492a..e0585e9040f1 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3758,7 +3758,7 @@ static ssize_t rbd_client_id_show(struct device *dev, struct rbd_device *rbd_dev = dev_to_rbd_dev(dev); return sprintf(buf, "client%lld\n", - ceph_client_id(rbd_dev->rbd_client->client)); + ceph_client_gid(rbd_dev->rbd_client->client)); } static ssize_t rbd_pool_show(struct device *dev, diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h index 83fc1fff7061..b4cffff70e44 100644 --- a/include/linux/ceph/libceph.h +++ b/include/linux/ceph/libceph.h @@ -264,7 +264,7 @@ extern struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private, u64 supported_features, u64 required_features); -extern u64 ceph_client_id(struct ceph_client *client); +u64 ceph_client_gid(struct ceph_client *client); extern void ceph_destroy_client(struct ceph_client *client); extern int __ceph_open_session(struct ceph_client *client, unsigned long started); diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c index bddfcf6f09c2..8a7921767308 100644 --- a/net/ceph/ceph_common.c +++ b/net/ceph/ceph_common.c @@ -566,11 +566,11 @@ int ceph_print_client_options(struct seq_file *m, struct ceph_client *client) } EXPORT_SYMBOL(ceph_print_client_options); -u64 ceph_client_id(struct ceph_client *client) +u64 ceph_client_gid(struct ceph_client *client) { return client->monc.auth->global_id; } -EXPORT_SYMBOL(ceph_client_id); +EXPORT_SYMBOL(ceph_client_gid); /* * create a fresh client instance @@ -685,7 +685,8 @@ int __ceph_open_session(struct ceph_client *client, unsigned long started) return client->auth_err; } - pr_info("client%llu fsid %pU\n", ceph_client_id(client), &client->fsid); + pr_info("client%llu fsid %pU\n", ceph_client_gid(client), + &client->fsid); ceph_debugfs_client_init(client); return 0;