From patchwork Mon Apr 27 17:13:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 6281941 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8418BBEEE1 for ; Mon, 27 Apr 2015 17:13:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D875203C1 for ; Mon, 27 Apr 2015 17:13:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AED35203C3 for ; Mon, 27 Apr 2015 17:13:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964839AbbD0RN1 (ORCPT ); Mon, 27 Apr 2015 13:13:27 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:33308 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964801AbbD0RNX (ORCPT ); Mon, 27 Apr 2015 13:13:23 -0400 Received: by pdbnk13 with SMTP id nk13so134862756pdb.0 for ; Mon, 27 Apr 2015 10:13:22 -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=Whj32hXmwtrPks1CAZdydqQDt/sPcqNX+VJZO06w8i0=; b=LqugIl0sI6ESafHqFJH1XzMJvzOfnkk93qkcz2wxOBvX1NtgywLo7KvLSFb1bdeVrx fFq/N8wiP+gLgW83diA0DQIf1Vi8lpMEO8kj/wYnv7Wsbu9QNOjxaV8OZuDxZrVZc285 ukkk7KkOLgV9+8StQEWR6c0K0AtjoNaYcGJyhFGWFdpGb3mIPiNViucDooKD20dJWq8S /Jbp5WS1Co1Nhs7gr0YPWQHD/zR9N/JjwHfi0mRzbPzZP/88e5+iWWAjmHprk4iMlKDw YplpfvoTrrkSwPSQuzip8nCrSJwug/yp7pg1Xzp2nIyDe6BPneOz7pWqN73SmiA6gqeM e5AA== X-Gm-Message-State: ALoCoQkj8sr3ydzAJLagQY187kEfKEBVCSeDnzH5WdsGk+/cUXqvwrsGVnTRzmsgyso2CSPpdl4n X-Received: by 10.66.139.234 with SMTP id rb10mr24028708pab.153.1430154802842; Mon, 27 Apr 2015 10:13:22 -0700 (PDT) Received: from shibby.corp.google.com ([104.135.1.105]) by mx.google.com with ESMTPSA id ff10sm12124675pab.13.2015.04.27.10.13.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Apr 2015 10:13:22 -0700 (PDT) From: Alex Elder To: ceph-devel@vger.kernel.org Subject: [PATCH 4/7] osd_client: don't supply connection to handle_reply() Date: Mon, 27 Apr 2015 12:13:12 -0500 Message-Id: <1430154795-17123-5-git-send-email-elder@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430154795-17123-1-git-send-email-elder@linaro.org> References: <1430154795-17123-1-git-send-email-elder@linaro.org> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 The connection parameter in handle_reply() is never used, so get rid of it. Signed-off-by: Alex Elder --- net/ceph/osd_client.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index e3c2e8b..6539dfc 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1748,8 +1748,7 @@ static void complete_request(struct ceph_osd_request *req) * handle osd op reply. either call the callback if it is specified, * or do the completion to wake up the waiting thread. */ -static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg, - struct ceph_connection *con) +static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg) { void *p, *end; struct ceph_osd_request *req; @@ -2796,7 +2795,7 @@ static void dispatch(struct ceph_connection *con, struct ceph_msg *msg) ceph_osdc_handle_map(osdc, msg); break; case CEPH_MSG_OSD_OPREPLY: - handle_reply(osdc, msg, con); + handle_reply(osdc, msg); break; case CEPH_MSG_WATCH_NOTIFY: handle_watch_notify(osdc, msg);