From patchwork Tue Jun 7 17:33:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858552 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p57HXFxt015750 for ; Tue, 7 Jun 2011 17:33:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757391Ab1FGRdb (ORCPT ); Tue, 7 Jun 2011 13:33:31 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:51817 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754744Ab1FGRdb (ORCPT ); Tue, 7 Jun 2011 13:33:31 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 99F5E30852CE; Tue, 7 Jun 2011 13:33:30 -0400 (EDT) X-Virus-Scanned: amavisd-new at int-mailstore01.merit.edu Received: from int-mailstore01.merit.edu ([127.0.0.1]) by localhost (int-mailstore01.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iCvaS6LzqwIU; Tue, 7 Jun 2011 13:33:30 -0400 (EDT) Received: from merit.edu (host-17.subnet-17.med.umich.edu [141.214.17.17]) by int-mailstore01.merit.edu (Postfix) with ESMTPSA id 356B53083A6D; Tue, 7 Jun 2011 13:33:30 -0400 (EDT) Date: Tue, 7 Jun 2011 13:33:29 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 63/88] SQUASHME: pnfs-block: use new read_pagelist api Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 07 Jun 2011 17:33:32 +0000 (UTC) From: Benny Halevy Signed-off-by: Benny Halevy --- fs/nfs/blocklayout/blocklayout.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index e2ee90a..80d25768 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -220,20 +220,18 @@ static void bl_rpc_do_nothing(struct rpc_task *task, void *calldata) } static enum pnfs_try_status -bl_read_pagelist(struct pnfs_layout_type *lo, - struct page **pages, - unsigned int pgbase, - unsigned nr_pages, - loff_t f_offset, - size_t count, - struct nfs_read_data *rdata) +bl_read_pagelist(struct nfs_read_data *rdata, + unsigned nr_pages) { int i, hole; struct bio *bio = NULL; struct pnfs_block_extent *be = NULL, *cow_read = NULL; sector_t isect, extent_length = 0; struct parallel_io *par; - int pg_index = pgbase >> PAGE_CACHE_SHIFT; + loff_t f_offset = rdata->args.offset; + size_t count = rdata->args.count; + struct page **pages = rdata->args.pages; + int pg_index = rdata->args.pgbase >> PAGE_CACHE_SHIFT; dprintk("%s enter nr_pages %u offset %lld count %Zd\n", __func__, nr_pages, f_offset, count);