From patchwork Wed Mar 13 01:02:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2260511 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 905123FCF6 for ; Wed, 13 Mar 2013 01:02:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932483Ab3CMBCl (ORCPT ); Tue, 12 Mar 2013 21:02:41 -0400 Received: from mail-ob0-f178.google.com ([209.85.214.178]:46153 "EHLO mail-ob0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932103Ab3CMBCk (ORCPT ); Tue, 12 Mar 2013 21:02:40 -0400 Received: by mail-ob0-f178.google.com with SMTP id wd20so485617obb.23 for ; Tue, 12 Mar 2013 18:02:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=rN6VCwxRxOUHIyM7fAIomZEmXBmGNLmM4RFtvdZ61I8=; b=M3ae+11ZlM6LDE1W2Mq3kMBrVLj3ieaflc3feTxMLYClpjnMis3a1PBZV4E8d4V298 yAZmrH2s2uZxqWvxJoDrlYAOoROcUK4i/Ln0RZL3xodDs0L0BbSiEb2ZLr8ej70HjKm0 +HTX89oyK8bhR4ToiU8WoesF8dFoXO66gy1IrgB6uRdnZHra+JWqw7bUdSI9xPOzbUk8 6DvBt7Mg/hRLQlWk7vSv2Xi8HCCPV8DGY7w5vRbQdAjSeWQT4Wx4sLbbBa11vqjihEKI tAcYOUB8JhgyJzVrGvfcX4quv+F0ZjdWoHZqXUv6k+sm2IesoynARYhXv7/NZ5J+gNOj HArg== X-Received: by 10.182.245.72 with SMTP id xm8mr14035202obc.1.1363136559743; Tue, 12 Mar 2013 18:02:39 -0700 (PDT) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id v8sm24493485oea.4.2013.03.12.18.02.37 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Mar 2013 18:02:38 -0700 (PDT) Message-ID: <513FD02C.3060207@inktank.com> Date: Tue, 12 Mar 2013 20:02:36 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130221 Thunderbird/17.0.3 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH] libceph: drop pages parameter X-Gm-Message-State: ALoCoQn5SsHGR052epHb71EZSYKmON3Evkm8BW8NzjGPG9fK1IdzHRrFcDpVZNajeaMrX2Hsi1a0 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org The "pages" parameter in read_partial_message_pages() is unused, so get rid of it. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- net/ceph/messenger.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) size_t length; @@ -2187,6 +2188,7 @@ static int read_partial_message_pages(struct ceph_connection *con, int ret; /* (page) data */ + pages = msg->p.pages; BUG_ON(pages == NULL); page = pages[msg_pos->page]; page_offset = msg_pos->page_pos; @@ -2258,8 +2260,8 @@ static int read_partial_msg_data(struct ceph_connection *con) data_len = le32_to_cpu(con->in_hdr.data_len); while (msg_pos->data_pos < data_len) { if (ceph_msg_has_pages(msg)) { - ret = read_partial_message_pages(con, msg->p.pages, - data_len, do_datacrc); + ret = read_partial_message_pages(con, data_len, + do_datacrc); if (ret <= 0) return ret; #ifdef CONFIG_BLOCK diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 997dacc..0d54ca4 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2176,10 +2176,11 @@ static int read_partial_message_section(struct ceph_connection *con, static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip); static int read_partial_message_pages(struct ceph_connection *con, - struct page **pages, unsigned int data_len, bool do_datacrc) { + struct ceph_msg *msg = con->in_msg; struct ceph_msg_pos *msg_pos = &con->in_msg_pos; + struct page **pages; struct page *page; size_t page_offset;