Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751041AbWC3MaF (ORCPT ); Thu, 30 Mar 2006 07:30:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751074AbWC3MaF (ORCPT ); Thu, 30 Mar 2006 07:30:05 -0500 Received: from ns.virtualhost.dk ([195.184.98.160]:60753 "EHLO virtualhost.dk") by vger.kernel.org with ESMTP id S1751041AbWC3MaC (ORCPT ); Thu, 30 Mar 2006 07:30:02 -0500 Date: Thu, 30 Mar 2006 14:30:12 +0200 From: Jens Axboe To: Andrew Morton Cc: linux-kernel@vger.kernel.org, torvalds@osdl.org Subject: Re: [PATCH] splice support #2 Message-ID: <20060330123011.GB13476@suse.de> References: <20060330100630.GT13476@suse.de> <20060330021644.7f7c5282.akpm@osdl.org> <20060330102419.GU13476@suse.de> <20060330031643.028a28de.akpm@osdl.org> <20060330115525.GV13476@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060330115525.GV13476@suse.de> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1355 Lines: 41 On Thu, Mar 30 2006, Jens Axboe wrote: > On Thu, Mar 30 2006, Andrew Morton wrote: > > Jens Axboe wrote: > > > > > > > > +static void *page_cache_pipe_buf_map(struct file *file, > > > > > + struct pipe_inode_info *info, > > > > > + struct pipe_buffer *buf) > > > > > +{ > > > > > + struct page *page = buf->page; > > > > > + > > > > > + lock_page(page); > > > > > + > > > > > + if (!PageUptodate(page)) { > > > > > > > > || page->mapping == NULL > > > > > > Fixed > > > > Actually that wasn't right. If the page was truncated then we shouldn't > > return -EIO to userspace. We should return zero, as this is the first > > page. > > _if_ this is the first page, then agree. > > > Which means either returning an ERR_PTR here for -EIO or re-checking i_size > > in the caller. Maybe the latter? > > The latter sounds better, I'll add that. Actually that's a little hard, since you don't know what state buf->page is in - it might be page cache, it might not be. So I opted for the ERR_PTR approach, just returning -ENODATA on !page->mapping. -- Jens Axboe - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/