From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e23smtp09.au.ibm.com ([202.81.31.142]:59555 "EHLO e23smtp09.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751960AbcBKRt1 (ORCPT ); Thu, 11 Feb 2016 12:49:27 -0500 Received: from localhost by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 12 Feb 2016 03:49:25 +1000 Received: from d23relay09.au.ibm.com (d23relay09.au.ibm.com [9.185.63.181]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id DB4A02CE8054 for ; Fri, 12 Feb 2016 04:49:23 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u1BHnFWk62980264 for ; Fri, 12 Feb 2016 04:49:23 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u1BHmovD021517 for ; Fri, 12 Feb 2016 04:48:51 +1100 From: Chandan Rajendra To: clm@fb.com, jbacik@fb.com, bo.li.liu@oracle.com, dsterba@suse.cz Cc: Chandan Rajendra , linux-btrfs@vger.kernel.org, chandan@mykolab.com Subject: [PATCH V15 10/15] Btrfs: subpage-blocksize: btrfs_punch_hole: Fix uptodate blocks check Date: Thu, 11 Feb 2016 23:17:48 +0530 Message-Id: <1455212873-14829-11-git-send-email-chandan@linux.vnet.ibm.com> In-Reply-To: <1455212873-14829-1-git-send-email-chandan@linux.vnet.ibm.com> References: <1455212873-14829-1-git-send-email-chandan@linux.vnet.ibm.com> Sender: linux-btrfs-owner@vger.kernel.org List-ID: In case of subpagesize-blocksize, the file blocks to be punched may map only part of a page. For file blocks inside such pages, we need to check for the presence of BLK_STATE_UPTODATE flag. Signed-off-by: Chandan Rajendra --- fs/btrfs/file.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index b8b0eda..7f5e64c 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2323,6 +2323,8 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) struct btrfs_path *path; struct btrfs_block_rsv *rsv; struct btrfs_trans_handle *trans; + struct address_space *mapping = inode->i_mapping; + pgoff_t start_index, end_index; u64 lockstart; u64 lockend; u64 tail_start; @@ -2335,6 +2337,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) int err = 0; unsigned int rsv_count; bool same_block; + bool same_page; bool no_holes = btrfs_fs_incompat(root->fs_info, NO_HOLES); u64 ino_size; bool truncated_block = false; @@ -2431,11 +2434,43 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) goto out_only_mutex; } + start_index = lockstart >> PAGE_CACHE_SHIFT; + end_index = lockend >> PAGE_CACHE_SHIFT; + + same_page = lockstart >> PAGE_CACHE_SHIFT + == lockend >> PAGE_CACHE_SHIFT; + while (1) { struct btrfs_ordered_extent *ordered; + struct page *start_page = NULL; + struct page *end_page = NULL; + u64 nr_pages; truncate_pagecache_range(inode, lockstart, lockend); + if (lockstart & (PAGE_CACHE_SIZE - 1)) { + start_page = find_or_create_page(mapping, start_index, + GFP_NOFS); + if (!start_page) { + mutex_unlock(&inode->i_mutex); + return -ENOMEM; + } + } + + if (!same_page && ((lockend + 1) & (PAGE_CACHE_SIZE - 1))) { + end_page = find_or_create_page(mapping, end_index, + GFP_NOFS); + if (!end_page) { + if (start_page) { + unlock_page(start_page); + page_cache_release(start_page); + } + mutex_unlock(&inode->i_mutex); + return -ENOMEM; + } + } + + lock_extent_bits(&BTRFS_I(inode)->io_tree, lockstart, lockend, &cached_state); ordered = btrfs_lookup_first_ordered_extent(inode, lockend); @@ -2445,18 +2480,47 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) * and nobody raced in and read a page in this range, if we did * we need to try again. */ + nr_pages = round_up(lockend, PAGE_CACHE_SIZE) + - round_down(lockstart, PAGE_CACHE_SIZE); + nr_pages >>= PAGE_CACHE_SHIFT; + if ((!ordered || (ordered->file_offset + ordered->len <= lockstart || ordered->file_offset > lockend)) && - !btrfs_page_exists_in_range(inode, lockstart, lockend)) { + (!(start_page && PagePrivate(start_page) && + test_page_blks_state(start_page, 1 << BLK_STATE_UPTODATE, + lockstart, + min(lockstart + PAGE_CACHE_SIZE - 1, lockend), 0)) && + !(end_page && PagePrivate(end_page) && + test_page_blks_state(end_page, 1 << BLK_STATE_UPTODATE, + page_offset(end_page), lockend, 0)) && + !(nr_pages > 2 && btrfs_page_exists_in_range(inode, + round_up(lockstart, PAGE_CACHE_SIZE), + round_down(lockend, PAGE_CACHE_SIZE) - 1)))) { if (ordered) btrfs_put_ordered_extent(ordered); + if (end_page) { + unlock_page(end_page); + page_cache_release(end_page); + } + if (start_page) { + unlock_page(start_page); + page_cache_release(start_page); + } break; } if (ordered) btrfs_put_ordered_extent(ordered); unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart, lockend, &cached_state, GFP_NOFS); + if (end_page) { + unlock_page(end_page); + page_cache_release(end_page); + } + if (start_page) { + unlock_page(start_page); + page_cache_release(start_page); + } ret = btrfs_wait_ordered_range(inode, lockstart, lockend - lockstart + 1); if (ret) { -- 2.1.0