From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Durgin Subject: Re: [PATCH] libceph: drop pages parameter Date: Thu, 14 Mar 2013 12:48:47 -0700 Message-ID: <5142299F.1000704@inktank.com> References: <513FD02C.3060207@inktank.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pb0-f54.google.com ([209.85.160.54]:44392 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751075Ab3CNTtb (ORCPT ); Thu, 14 Mar 2013 15:49:31 -0400 Received: by mail-pb0-f54.google.com with SMTP id rr4so2689910pbb.41 for ; Thu, 14 Mar 2013 12:49:31 -0700 (PDT) In-Reply-To: <513FD02C.3060207@inktank.com> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: Alex Elder Cc: ceph-devel@vger.kernel.org Reviewed-by: Josh Durgin On 03/12/2013 06:02 PM, Alex Elder wrote: > The "pages" parameter in read_partial_message_pages() is > unused, so get rid of it. > > Signed-off-by: Alex Elder > --- > net/ceph/messenger.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > 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; > 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 >