From patchwork Mon Mar 4 18:09:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2213691 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 E1A1DDF2F2 for ; Mon, 4 Mar 2013 18:09:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758435Ab3CDSJ3 (ORCPT ); Mon, 4 Mar 2013 13:09:29 -0500 Received: from mail-ia0-f172.google.com ([209.85.210.172]:37329 "EHLO mail-ia0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757985Ab3CDSJ2 (ORCPT ); Mon, 4 Mar 2013 13:09:28 -0500 Received: by mail-ia0-f172.google.com with SMTP id l29so5124476iag.3 for ; Mon, 04 Mar 2013 10:09:28 -0800 (PST) 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 :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=3bwhp+SOgdmjiZB+8WM0gQ1zzpDZtp9/BcyHyjLACJI=; b=Na289SIVJbrCMApefU3RmAwYGs7r4yT6GBozkE9wUIHU76vhMg3cHGH+Z+42TXk1bo hZzPeLtG40M++lAGfRBt2yb59cMjrOneWCn7sdTq3TCbe99TaCg64cU+/FS0nAK+bdd5 +nVkxzyzaLN3/Mz21xVbiHuVoWSxLp6DHhykWp+W6vtiP/TcfngEjffb8K9QPGV5VCiV jh8OIHd/o+UDBtTHMNEuqEfD62kUyhmnxwUNf7UoBipsx+Mg6xwYa9k6R1VFr8L2t5J9 eYGH0YXjGs0BviCbi/3OJ6OWGWRYmK47X+jhgJU2yW6kMyKLEUkVzBbHDmHWR5C3x+Y+ UjeQ== X-Received: by 10.50.10.161 with SMTP id j1mr3164167igb.45.1362420568091; Mon, 04 Mar 2013 10:09:28 -0800 (PST) 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 wn10sm10393031igb.2.2013.03.04.10.09.26 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Mar 2013 10:09:27 -0800 (PST) Message-ID: <5134E358.50309@inktank.com> Date: Mon, 04 Mar 2013 12:09:28 -0600 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 2/3] libceph: kill ceph_msg->pagelist_count References: <5134E25E.4030701@inktank.com> <5134E30E.2090400@inktank.com> In-Reply-To: <5134E30E.2090400@inktank.com> X-Gm-Message-State: ALoCoQnV8LQtyKfaLunpfF+QVhQAwthh2oLsdU0DmkT4iyvQEzY6qkdEhOFkxBCE6oA7TkB8BHJa Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org The pagelist_count field is never actually used, so get rid of it. Signed-off-by: Alex Elder --- fs/ceph/mds_client.c | 1 - include/linux/ceph/messenger.h | 1 - net/ceph/messenger.c | 2 -- 3 files changed, 4 deletions(-) m->bio = NULL; @@ -2898,7 +2897,6 @@ void ceph_msg_last_put(struct kref *kref) ceph_pagelist_release(m->pagelist); kfree(m->pagelist); m->pagelist = NULL; - m->pagelist_count = 0; } m->trail = NULL; diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 44435c2..76b7344 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2600,7 +2600,6 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc, } reply->pagelist = pagelist; - reply->pagelist_count = calc_pages_for(0, pagelist->length); if (recon_state.flock) reply->hdr.version = cpu_to_le16(2); reply->hdr.data_len = cpu_to_le32(pagelist->length); diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index 1b08349..6c11874 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h @@ -78,7 +78,6 @@ struct ceph_msg { unsigned page_count; /* size of page array */ unsigned page_alignment; /* io offset in first page */ struct ceph_pagelist *pagelist; /* instead of pages */ - unsigned int pagelist_count; /* number of pages in pagelist */ struct ceph_connection *con; struct list_head list_head; diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 9d8abb0..0f9933a 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2718,7 +2718,6 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags, m->page_count = 0; m->page_alignment = 0; m->pages = NULL; - m->pagelist_count = 0; m->pagelist = NULL; #ifdef CONFIG_BLOCK