From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753082Ab3JUVsg (ORCPT ); Mon, 21 Oct 2013 17:48:36 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:42334 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751573Ab3JUVsd (ORCPT ); Mon, 21 Oct 2013 17:48:33 -0400 Date: Mon, 21 Oct 2013 14:48:28 -0700 From: Ning Qu To: Andrea Arcangeli , Andrew Morton , "Kirill A. Shutemov" , Hugh Dickins Cc: Al Viro , Hugh Dickins , Wu Fengguang , Jan Kara , Mel Gorman , linux-mm@kvack.org, Andi Kleen , Matthew Wilcox , Hillf Danton , Dave Hansen , Alexander Shishkin , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Ning Qu , Ning Qu Subject: [PATCHv2 11/13] mm, thp, tmpfs: only alloc small pages in shmem_file_splice_read Message-ID: <20131021214828.GL29870@hippobay.mtv.corp.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We just hope this is not a common case path. The huge page can't be added without completely refactoring the code. Signed-off-by: Ning Qu --- mm/shmem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/shmem.c b/mm/shmem.c index 48b1d84..c42331a 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1950,6 +1950,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos, index += spd.nr_pages; error = 0; + i_split_down_read(inode); while (spd.nr_pages < nr_pages) { error = shmem_getpage(inode, index, &page, SGP_CACHE, gfp, 0, NULL); @@ -2019,6 +2020,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos, *ppos += error; file_accessed(in); } + i_split_up_read(inode); return error; } -- 1.8.4