From patchwork Fri Jun 8 12:47:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 10454315 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8DE5F60467 for ; Fri, 8 Jun 2018 12:48:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 774C72923E for ; Fri, 8 Jun 2018 12:48:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6BD9029272; Fri, 8 Jun 2018 12:48:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20B082923E for ; Fri, 8 Jun 2018 12:48:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752806AbeFHMsS (ORCPT ); Fri, 8 Jun 2018 08:48:18 -0400 Received: from mx2.suse.de ([195.135.220.15]:44262 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752774AbeFHMsG (ORCPT ); Fri, 8 Jun 2018 08:48:06 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 1EE85AF8D for ; Fri, 8 Jun 2018 12:48:06 +0000 (UTC) From: Nikolay Borisov To: linux-btrfs@vger.kernel.org Cc: Nikolay Borisov Subject: [PATCH 13/15] btrfs-progs: Add alloc_reserved_tree_block2 function Date: Fri, 8 Jun 2018 15:47:56 +0300 Message-Id: <1528462078-24490-14-git-send-email-nborisov@suse.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528462078-24490-1-git-send-email-nborisov@suse.com> References: <1528462078-24490-1-git-send-email-nborisov@suse.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is a simple adapter function to convert the delayed-refs structures to the current arguments of alloc_reserved_tree_block. Signed-off-by: Nikolay Borisov --- extent-tree.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/extent-tree.c b/extent-tree.c index 8789a43c7fea..3208ed11cb91 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -2687,6 +2687,30 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans, return ret; } +static int alloc_reserved_tree_block2(struct btrfs_trans_handle *trans, + struct btrfs_delayed_ref_node *node, + struct btrfs_delayed_extent_op *extent_op) +{ + + struct btrfs_delayed_tree_ref *ref = btrfs_delayed_node_to_tree_ref(node); + struct btrfs_key ins; + bool skinny_metadata = btrfs_fs_incompat(trans->fs_info, SKINNY_METADATA); + + ins.objectid = node->bytenr; + if (skinny_metadata) { + ins.offset = ref->level; + ins.type = BTRFS_METADATA_ITEM_KEY; + } else { + ins.offset = node->num_bytes; + ins.type = BTRFS_EXTENT_ITEM_KEY; + } + + return alloc_reserved_tree_block(trans, ref->root, trans->transid, + extent_op->flags_to_set, + &extent_op->key, ref->level, &ins); + +} + static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans, u64 root_objectid, u64 generation, u64 flags, struct btrfs_disk_key *key,