Return-Path: Received: from e23smtp07.au.ibm.com ([202.81.31.140]:41724 "EHLO e23smtp07.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752413AbaKLISq (ORCPT ); Wed, 12 Nov 2014 03:18:46 -0500 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 12 Nov 2014 18:18:43 +1000 Received: from d23relay07.au.ibm.com (d23relay07.au.ibm.com [9.190.26.37]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 0D0132BB0076 for ; Wed, 12 Nov 2014 19:18:41 +1100 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sAC8IPYA37814430 for ; Wed, 12 Nov 2014 19:18:26 +1100 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sAC8IdLY009107 for ; Wed, 12 Nov 2014 19:18:40 +1100 From: Chandan Rajendra To: clm@fb.com, jbacik@fb.com, bo.li.liu@oracle.com, dsterba@suse.cz Cc: Chandan Rajendra , aneesh.kumar@linux.vnet.ibm.com, linux-btrfs@vger.kernel.org, chandan@mykolab.com, steve.capper@linaro.org Subject: [RFC PATCH V8 11/16] Btrfs: subpagesize-blocksize: btrfs_page_mkwrite: Reserve space in sectorsized units. Date: Wed, 12 Nov 2014 13:47:43 +0530 Message-Id: <1415780268-2017-12-git-send-email-chandan@linux.vnet.ibm.com> In-Reply-To: <1415780268-2017-1-git-send-email-chandan@linux.vnet.ibm.com> References: <1415780268-2017-1-git-send-email-chandan@linux.vnet.ibm.com> Sender: linux-btrfs-owner@vger.kernel.org List-ID: In subpagesize-blocksize scenario, if i_size occurs in a block which is not the last block in the page, then the space to be reserved should be calculated appropriately. Signed-off-by: Chandan Rajendra --- fs/btrfs/inode.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 7ad7d0f..23ce9ff 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7812,26 +7812,23 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) loff_t size; int ret; int reserved = 0; + u64 delalloc_size; u64 page_start; u64 page_end; sb_start_pagefault(inode->i_sb); - ret = btrfs_delalloc_reserve_space(inode, PAGE_CACHE_SIZE); - if (!ret) { - ret = file_update_time(vma->vm_file); - reserved = 1; - } + + ret = file_update_time(vma->vm_file); if (ret) { if (ret == -ENOMEM) ret = VM_FAULT_OOM; else /* -ENOSPC, -EIO, etc */ ret = VM_FAULT_SIGBUS; - if (reserved) - goto out; - goto out_noreserve; + goto out; } ret = VM_FAULT_NOPAGE; /* make the VM retry the fault */ + again: lock_page(page); size = i_size_read(inode); @@ -7862,6 +7859,19 @@ again: goto again; } + if (page->index == ((size - 1) >> PAGE_CACHE_SHIFT)) + delalloc_size = round_up(size - page_start, root->sectorsize); + else + delalloc_size = PAGE_CACHE_SIZE; + + ret = btrfs_delalloc_reserve_space(inode, delalloc_size); + if (ret) { + /* -ENOSPC */ + ret = VM_FAULT_SIGBUS; + goto out_unlock; + } + reserved = 1; + /* * XXX - page_mkwrite gets called every time the page is dirtied, even * if it was already dirty, so for space accounting reasons we need to @@ -7874,7 +7884,8 @@ again: EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, 0, 0, &cached_state, GFP_NOFS); - ret = btrfs_set_extent_delalloc(inode, page_start, page_end, + ret = btrfs_set_extent_delalloc(inode, page_start, + page_start + delalloc_size - 1, &cached_state); if (ret) { unlock_extent_cached(io_tree, page_start, page_end, @@ -7913,8 +7924,8 @@ out_unlock: } unlock_page(page); out: - btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE); -out_noreserve: + if (reserved) + btrfs_delalloc_release_space(inode, delalloc_size); sb_end_pagefault(inode->i_sb); return ret; } -- 2.1.0