From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Lameter Subject: Re: [patch 13/19] Use page_cache_xxx in fs/splice.c Date: Wed, 28 Nov 2007 19:50:16 -0800 (PST) Message-ID: References: <20071129011052.866354847@sgi.com> <20071129011147.323915994@sgi.com> <20071129034011.GU119954183@sgi.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: akpm@linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , Mel Gorman , William Lee Irwin III , Jens Axboe , Badari Pulavarty , Maxim Levitsky , Fengguang Wu , swin wang , totty.lu@gmail.com, hugh@veritas.com, joern@lazybastard.org To: David Chinner Return-path: Received: from relay1.sgi.com ([192.48.171.29]:38085 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755511AbXK2DuR (ORCPT ); Wed, 28 Nov 2007 22:50:17 -0500 In-Reply-To: <20071129034011.GU119954183@sgi.com> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org On Thu, 29 Nov 2007, David Chinner wrote: > On Wed, Nov 28, 2007 at 05:11:05PM -0800, Christoph Lameter wrote: > > @@ -453,7 +454,7 @@ fill_it: > > */ > > while (page_nr < nr_pages) > > page_cache_release(pages[page_nr++]); > > - in->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT; > > + in->f_ra.prev_pos = page_cache_index(mapping, index); > > in->f_ra.prev_pos = page_cache_pos(mapping, index, 0); > splice.c: Wrong inline function used Signed-off-by: Christoph Lameter --- fs/splice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: mm/fs/splice.c =================================================================== --- mm.orig/fs/splice.c 2007-11-28 19:48:43.246633219 -0800 +++ mm/fs/splice.c 2007-11-28 19:49:06.405882592 -0800 @@ -454,7 +454,7 @@ fill_it: */ while (page_nr < nr_pages) page_cache_release(pages[page_nr++]); - in->f_ra.prev_pos = page_cache_index(mapping, index); + in->f_ra.prev_pos = page_cache_pos(mapping, index, 0); if (spd.nr_pages) return splice_to_pipe(pipe, &spd);