Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753563AbcK2L3m (ORCPT ); Tue, 29 Nov 2016 06:29:42 -0500 Received: from mga06.intel.com ([134.134.136.31]:21031 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757278AbcK2LXq (ORCPT ); Tue, 29 Nov 2016 06:23:46 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,568,1473145200"; d="scan'208";a="1091991731" 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 33/36] ext4: fix SEEK_DATA/SEEK_HOLE for huge pages Date: Tue, 29 Nov 2016 14:23:01 +0300 Message-Id: <20161129112304.90056-34-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: 2050 Lines: 71 ext4_find_unwritten_pgoff() needs few tweaks to work with huge pages. Mostly trivial page_mapping()/page_to_pgoff() and adjustment to how we find relevant block. Signe-off-by: Kirill A. Shutemov --- fs/ext4/file.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/fs/ext4/file.c b/fs/ext4/file.c index b5f184493c57..7998ac1483c4 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -547,7 +547,7 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, * range, it will be a hole. */ if (lastoff < endoff && whence == SEEK_HOLE && - page->index > end) { + page_to_pgoff(page) > end) { found = 1; *offset = lastoff; goto out; @@ -555,7 +555,7 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, lock_page(page); - if (unlikely(page->mapping != inode->i_mapping)) { + if (unlikely(page_mapping(page) != inode->i_mapping)) { unlock_page(page); continue; } @@ -566,8 +566,12 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, } if (page_has_buffers(page)) { + int diff; lastoff = page_offset(page); bh = head = page_buffers(page); + diff = (page - compound_head(page)) << inode->i_blkbits; + while (diff--) + bh = bh->b_this_page; do { if (buffer_uptodate(bh) || buffer_unwritten(bh)) { @@ -588,8 +592,12 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, } while (bh != head); } - lastoff = page_offset(page) + PAGE_SIZE; + lastoff = page_offset(page) + hpage_size(page); unlock_page(page); + if (PageTransCompound(page)) { + i++; + break; + } } /* @@ -602,7 +610,9 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, break; } - index = pvec.pages[i - 1]->index + 1; + index = page_to_pgoff(pvec.pages[i - 1]) + 1; + if (PageTransCompound(pvec.pages[i - 1])) + index = round_up(index, HPAGE_PMD_NR); pagevec_release(&pvec); } while (index <= end); -- 2.10.2