From patchwork Mon Aug 29 15:37:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 1110112 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7TF2o7E017292 for ; Mon, 29 Aug 2011 17:02:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753945Ab1H2Ph5 (ORCPT ); Mon, 29 Aug 2011 11:37:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28771 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753791Ab1H2Ph5 (ORCPT ); Mon, 29 Aug 2011 11:37:57 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7TFbvGM025239 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 29 Aug 2011 11:37:57 -0400 Received: from localhost.localdomain.com (vpn-11-28.rdu.redhat.com [10.11.11.28]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7TFbu7q021225 for ; Mon, 29 Aug 2011 11:37:56 -0400 From: Josef Bacik To: linux-btrfs@vger.kernel.org Subject: [PATCH] Btrfs: don't use delalloc block rsv for free space inodes V2 Date: Mon, 29 Aug 2011 11:37:56 -0400 Message-Id: <1314632276-14451-1-git-send-email-josef@redhat.com> In-Reply-To: <1314631147-13434-1-git-send-email-josef@redhat.com> References: <1314631147-13434-1-git-send-email-josef@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 29 Aug 2011 17:04:39 +0000 (UTC) In tracking down this "not enough space" warning with checksums, it seems that we were running out of space partly because we do not reserve space for our free space inodes. Since this is technically metadata anyway go ahead and use the global_block_rsv for our free space inodes. We shouldn't be modifying too much other metadata since this will be a preallocated extent and that was already accounted for earlier. Thanks, Signed-off-by: Josef Bacik --- V1->V2: forgot about one case fs/btrfs/inode.c | 56 ++++++++++++++++++++++------------------------------- 1 files changed, 23 insertions(+), 33 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 0ee0677..76fe4d9 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1057,22 +1057,21 @@ static noinline int run_delalloc_nocow(struct inode *inode, int type; int nocow; int check_prev = 1; - bool nolock; u64 ino = btrfs_ino(inode); path = btrfs_alloc_path(); if (!path) return -ENOMEM; - nolock = btrfs_is_free_space_inode(root, inode); - - if (nolock) + if (btrfs_is_free_space_inode(root, inode)) { trans = btrfs_join_transaction_nolock(root); - else + BUG_ON(IS_ERR(trans)); + trans->block_rsv = &root->fs_info->global_block_rsv; + } else { trans = btrfs_join_transaction(root); - - BUG_ON(IS_ERR(trans)); - trans->block_rsv = &root->fs_info->delalloc_block_rsv; + BUG_ON(IS_ERR(trans)); + trans->block_rsv = &root->fs_info->delalloc_block_rsv; + } cow_start = (u64)-1; cur_offset = start; @@ -1245,13 +1244,12 @@ out_check: BUG_ON(ret); } - if (nolock) { + if (btrfs_is_free_space_inode(root, inode)) ret = btrfs_end_transaction_nolock(trans, root); - BUG_ON(ret); - } else { + else ret = btrfs_end_transaction(trans, root); - BUG_ON(ret); - } + BUG_ON(ret); + btrfs_free_path(path); return 0; } @@ -1717,7 +1715,6 @@ static int btrfs_finish_ordered_io(struct inode *inode, u64 start, u64 end) struct extent_state *cached_state = NULL; int compress_type = 0; int ret; - bool nolock; ret = btrfs_dec_test_ordered_pending(inode, &ordered_extent, start, end - start + 1); @@ -1725,18 +1722,20 @@ static int btrfs_finish_ordered_io(struct inode *inode, u64 start, u64 end) return 0; BUG_ON(!ordered_extent); - nolock = btrfs_is_free_space_inode(root, inode); + if (btrfs_is_free_space_inode(root, inode)) { + trans = btrfs_join_transaction_nolock(root); + BUG_ON(IS_ERR(trans)); + trans->block_rsv = &root->fs_info->global_block_rsv; + } else{ + trans = btrfs_join_transaction(root); + BUG_ON(IS_ERR(trans)); + trans->block_rsv = &root->fs_info->delalloc_block_rsv; + } if (test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags)) { BUG_ON(!list_empty(&ordered_extent->list)); ret = btrfs_ordered_update_i_size(inode, 0, ordered_extent); if (!ret) { - if (nolock) - trans = btrfs_join_transaction_nolock(root); - else - trans = btrfs_join_transaction(root); - BUG_ON(IS_ERR(trans)); - trans->block_rsv = &root->fs_info->delalloc_block_rsv; ret = btrfs_update_inode(trans, root, inode); BUG_ON(ret); } @@ -1747,13 +1746,6 @@ static int btrfs_finish_ordered_io(struct inode *inode, u64 start, u64 end) ordered_extent->file_offset + ordered_extent->len - 1, 0, &cached_state, GFP_NOFS); - if (nolock) - trans = btrfs_join_transaction_nolock(root); - else - trans = btrfs_join_transaction(root); - BUG_ON(IS_ERR(trans)); - trans->block_rsv = &root->fs_info->delalloc_block_rsv; - if (test_bit(BTRFS_ORDERED_COMPRESSED, &ordered_extent->flags)) compress_type = ordered_extent->compress_type; if (test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags)) { @@ -1792,13 +1784,11 @@ static int btrfs_finish_ordered_io(struct inode *inode, u64 start, u64 end) } ret = 0; out: - if (nolock) { - if (trans) - btrfs_end_transaction_nolock(trans, root); + if (btrfs_is_free_space_inode(root, inode)) { + btrfs_end_transaction_nolock(trans, root); } else { btrfs_delalloc_release_metadata(inode, ordered_extent->len); - if (trans) - btrfs_end_transaction(trans, root); + btrfs_end_transaction(trans, root); } /* once for us */