From patchwork Thu Mar 27 18:17:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 3899101 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 50F80BF540 for ; Thu, 27 Mar 2014 18:18:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6FB9120253 for ; Thu, 27 Mar 2014 18:18:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9986820225 for ; Thu, 27 Mar 2014 18:18:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756829AbaC0SS1 (ORCPT ); Thu, 27 Mar 2014 14:18:27 -0400 Received: from mail-ee0-f50.google.com ([74.125.83.50]:42373 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754922AbaC0SS0 (ORCPT ); Thu, 27 Mar 2014 14:18:26 -0400 Received: by mail-ee0-f50.google.com with SMTP id c13so3272272eek.9 for ; Thu, 27 Mar 2014 11:18:24 -0700 (PDT) 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=qpo6DoJTvpu6u8MfdTN78GSoz6yZ4SsmHu6rplFpfZc=; b=FJEA6dMo2IRh4SO1nZ9kHUIPEiMV1riu3kvjGEHm40M4VW/o9gjJ+j4g6wVz3xAAyY th1mes0sBSMFqPhESVPoOBpZqy0WAgEDPIpv90yENIkvI3uisCqMdCf45tB2cN/rYI7v /1syD132hzzhtWfQC9ZCPwwkUkhj5EWcv/B2uY6UampCVMYIvvVKfsVhGcCEiK+9Dw/m d2JLHQeJP1QQ3qH9ktaHzEej2EmWjP5SwZEkBlcrQNqdCj5xVtmN+IvV/rX6VRcvHekt J2sfneZqYNVCSh/rY+iCtQ5x8LEuToFdhv3wFFiZvhr3VH0AnIDpxt8CmRM71nBtbx/r wX6Q== X-Gm-Message-State: ALoCoQlwaHLTRTmhs2ONm9zShDtFnyYvIazvQxS32cIqTbQ8FOW3/p8gJERcS/LBdeZQtgsMhRlx X-Received: by 10.15.54.6 with SMTP id s6mr3196502eew.4.1395944304804; Thu, 27 Mar 2014 11:18:24 -0700 (PDT) Received: from localhost ([109.110.66.7]) by mx.google.com with ESMTPSA id y51sm5991444eeu.0.2014.03.27.11.18.23 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 27 Mar 2014 11:18:24 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 01/33] libceph: refer to osdmap directly in osdmap_show() Date: Thu, 27 Mar 2014 20:17:47 +0200 Message-Id: <1395944299-21970-2-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395944299-21970-1-git-send-email-ilya.dryomov@inktank.com> References: <1395944299-21970-1-git-send-email-ilya.dryomov@inktank.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To make it more readable and save screen space. Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- net/ceph/debugfs.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/net/ceph/debugfs.c b/net/ceph/debugfs.c index 258a382e75ed..d225842c7b41 100644 --- a/net/ceph/debugfs.c +++ b/net/ceph/debugfs.c @@ -53,34 +53,36 @@ static int osdmap_show(struct seq_file *s, void *p) { int i; struct ceph_client *client = s->private; + struct ceph_osdmap *map = client->osdc.osdmap; struct rb_node *n; - if (client->osdc.osdmap == NULL) + if (map == NULL) return 0; - seq_printf(s, "epoch %d\n", client->osdc.osdmap->epoch); + + seq_printf(s, "epoch %d\n", map->epoch); seq_printf(s, "flags%s%s\n", - (client->osdc.osdmap->flags & CEPH_OSDMAP_NEARFULL) ? - " NEARFULL" : "", - (client->osdc.osdmap->flags & CEPH_OSDMAP_FULL) ? - " FULL" : ""); - for (n = rb_first(&client->osdc.osdmap->pg_pools); n; n = rb_next(n)) { + (map->flags & CEPH_OSDMAP_NEARFULL) ? " NEARFULL" : "", + (map->flags & CEPH_OSDMAP_FULL) ? " FULL" : ""); + + for (n = rb_first(&map->pg_pools); n; n = rb_next(n)) { struct ceph_pg_pool_info *pool = rb_entry(n, struct ceph_pg_pool_info, node); + seq_printf(s, "pg_pool %llu pg_num %d / %d\n", (unsigned long long)pool->id, pool->pg_num, pool->pg_num_mask); } - for (i = 0; i < client->osdc.osdmap->max_osd; i++) { - struct ceph_entity_addr *addr = - &client->osdc.osdmap->osd_addr[i]; - int state = client->osdc.osdmap->osd_state[i]; + for (i = 0; i < map->max_osd; i++) { + struct ceph_entity_addr *addr = &map->osd_addr[i]; + int state = map->osd_state[i]; char sb[64]; seq_printf(s, "\tosd%d\t%s\t%3d%%\t(%s)\n", i, ceph_pr_addr(&addr->in_addr), - ((client->osdc.osdmap->osd_weight[i]*100) >> 16), + ((map->osd_weight[i]*100) >> 16), ceph_osdmap_state_str(sb, sizeof(sb), state)); } + return 0; }