From patchwork Tue Nov 4 14:34:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Spray X-Patchwork-Id: 5228111 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AF7119F3EE for ; Tue, 4 Nov 2014 14:35:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DA6E820166 for ; Tue, 4 Nov 2014 14:35:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 04AC6200F0 for ; Tue, 4 Nov 2014 14:35:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752853AbaKDOfO (ORCPT ); Tue, 4 Nov 2014 09:35:14 -0500 Received: from mail-wi0-f173.google.com ([209.85.212.173]:55550 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754026AbaKDOfN (ORCPT ); Tue, 4 Nov 2014 09:35:13 -0500 Received: by mail-wi0-f173.google.com with SMTP id n3so9580565wiv.6 for ; Tue, 04 Nov 2014 06:35:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=NQK4SeLHEnTsd6s+Ws0noSWMsOyLxVeydwknZo5E41s=; b=Pld3AUnjCYK2HEQMG6f/ajUSeBdQJaBnR/1wfolnPoEdFcCO9OGXv73ch6M++clCRA X7bXQrsrm4q1XBVqdlLZIY4w5I/dGxzd0O+cgdSPYePZ11hA8B9eEmo8SENOq6hu16BM 59oL3J4nkyrsI7v5c3LYxflUeZT7TCNZTdfBPFgZ+xI+iNReiqERLq97fgqe7u9yfCuF GbGUzB8yRQz8o7kM51P/4pplelPV2hIy61xijBc1U4qxl43Gy3NOeK9JdJP26BrbdJMe IW6MRdLHOpnwNCjzt3BbBbA05JdNN2dFv4eclontaMP4XyxgMLP8a2x1nu1k1Wj5MDXS AbCw== X-Gm-Message-State: ALoCoQmkTftyQ97uW+9VC8c2q/u9MWXb/mxTGxouaryzH+a6AfRo2mrW1EfOUA973dVHesYOOuHP X-Received: by 10.180.88.162 with SMTP id bh2mr24440946wib.77.1415111711708; Tue, 04 Nov 2014 06:35:11 -0800 (PST) Received: from anthracite.localdomain (82-71-55-202.dsl.in-addr.zen.co.uk. [82.71.55.202]) by mx.google.com with ESMTPSA id w5sm1229004wif.18.2014.11.04.06.35.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Nov 2014 06:35:11 -0800 (PST) From: John Spray To: ceph-devel@vger.kernel.org Cc: John Spray Subject: [PATCH 2/7] ceph: remove unused `map_waiters` from osdc client Date: Tue, 4 Nov 2014 14:34:24 +0000 Message-Id: <1415111669-26246-3-git-send-email-john.spray@redhat.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1415111669-26246-1-git-send-email-john.spray@redhat.com> References: <1415111669-26246-1-git-send-email-john.spray@redhat.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.5 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 This is initialized but never used. Signed-off-by: John Spray --- include/linux/ceph/osd_client.h | 1 - net/ceph/osd_client.c | 1 - 2 files changed, 2 deletions(-) diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 03aeb27..7cb5cea 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -197,7 +197,6 @@ struct ceph_osd_client { struct ceph_osdmap *osdmap; /* current map */ struct rw_semaphore map_sem; - struct completion map_waiters; u64 last_requested_map; struct mutex request_mutex; diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 5a75395..75ab07c 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -2537,7 +2537,6 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client) osdc->client = client; osdc->osdmap = NULL; init_rwsem(&osdc->map_sem); - init_completion(&osdc->map_waiters); osdc->last_requested_map = 0; mutex_init(&osdc->request_mutex); osdc->last_tid = 0;