From patchwork Fri Aug 17 16:50:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sage Weil X-Patchwork-Id: 1339121 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 68B94DF280 for ; Fri, 17 Aug 2012 16:38:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758482Ab2HQQiS (ORCPT ); Fri, 17 Aug 2012 12:38:18 -0400 Received: from cobra.newdream.net ([66.33.216.30]:47000 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758450Ab2HQQiS (ORCPT ); Fri, 17 Aug 2012 12:38:18 -0400 Received: from fatty.ops.newdream.net (unknown [38.122.20.226]) by cobra.newdream.net (Postfix) with ESMTPA id 181678044D; Fri, 17 Aug 2012 09:38:18 -0700 (PDT) From: Sage Weil To: ceph-devel@vger.kernel.org Cc: zheng.z.yan@intel.com, Sage Weil Subject: [PATCH 2/2] libceph: remove unused monc->have_fsid Date: Fri, 17 Aug 2012 09:50:04 -0700 Message-Id: <1345222204-9583-2-git-send-email-sage@inktank.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1345222204-9583-1-git-send-email-sage@inktank.com> References: <1345222204-9583-1-git-send-email-sage@inktank.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org This is unused; use monc->client->have_fsid. Signed-off-by: Sage Weil --- include/linux/ceph/mon_client.h | 1 - net/ceph/mon_client.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/linux/ceph/mon_client.h b/include/linux/ceph/mon_client.h index 2113e38..1dc508a 100644 --- a/include/linux/ceph/mon_client.h +++ b/include/linux/ceph/mon_client.h @@ -71,7 +71,6 @@ struct ceph_mon_client { int cur_mon; /* last monitor i contacted */ unsigned long sub_sent, sub_renew_after; struct ceph_connection con; - bool have_fsid; /* pending generic requests */ struct rb_root generic_request_tree; diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index b9f412d..5072ccc 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -768,7 +768,6 @@ static int build_initial_monmap(struct ceph_mon_client *monc) monc->monmap->mon_inst[i].name.num = cpu_to_le64(i); } monc->monmap->num_mon = num_mon; - monc->have_fsid = false; return 0; }