Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933626AbcK2Lce (ORCPT ); Tue, 29 Nov 2016 06:32:34 -0500 Received: from mga09.intel.com ([134.134.136.24]:2751 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757251AbcK2LXm (ORCPT ); Tue, 29 Nov 2016 06:23:42 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,568,1473145200"; d="scan'208";a="10982387" From: "Kirill A. Shutemov" To: "Theodore Ts'o" , Andreas Dilger , Jan Kara , Andrew Morton Cc: Alexander Viro , Hugh Dickins , Andrea Arcangeli , Dave Hansen , Vlastimil Babka , Matthew Wilcox , Ross Zwisler , linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv5 24/36] ext4: make ext4_mpage_readpages() hugepage-aware Date: Tue, 29 Nov 2016 14:22:52 +0300 Message-Id: <20161129112304.90056-25-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161129112304.90056-1-kirill.shutemov@linux.intel.com> References: <20161129112304.90056-1-kirill.shutemov@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 833 Lines: 27 As BIO_MAX_PAGES is smaller (on x86) than HPAGE_PMD_NR, we cannot use the optimization ext4_mpage_readpages() provides. So, for huge pages, we fallback directly to block_read_full_page(). This should be re-visited once we get multipage bvec upstream. Signed-off-by: Kirill A. Shutemov --- fs/ext4/readpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c index a81b829d56de..b865df0c0973 100644 --- a/fs/ext4/readpage.c +++ b/fs/ext4/readpage.c @@ -134,7 +134,7 @@ int ext4_mpage_readpages(struct address_space *mapping, goto next_page; } - if (page_has_buffers(page)) + if (page_has_buffers(page) || PageTransHuge(page)) goto confused; block_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits); -- 2.10.2