From patchwork Mon Nov 5 19:06:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 10668981 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BE2F3181D for ; Mon, 5 Nov 2018 19:06:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE5122929F for ; Mon, 5 Nov 2018 19:06:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A203B2926B; Mon, 5 Nov 2018 19:06:49 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 3412F2929F for ; Mon, 5 Nov 2018 19:06:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387629AbeKFE1v (ORCPT ); Mon, 5 Nov 2018 23:27:51 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:43723 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387460AbeKFE1v (ORCPT ); Mon, 5 Nov 2018 23:27:51 -0500 Received: by mail-pg1-f195.google.com with SMTP id n10-v6so4630591pgv.10 for ; Mon, 05 Nov 2018 11:06:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=23sC8kdtiHWrAvH9E3iiXK6MRXIah97kJUhFH8UMkp8=; b=k/8AHHuDH9+j8FyK7qnE4s4AmDHpTNWdXDXaDmwMF01Bix72gyBX9UeAs9BczCuYrY naUfdVP/Tz4YIeu7ny8wBNQtRxfyViO2udO3RaGFgmxWi0yTW0GPce2aifrf+5/FvZrW pp5Ts7LlkOLpoIGcxEOXUtiPY1zsPc3rztFCqejmUhsnqlKwdD7B4JGiAgoqIP+xEGVS V90zO5SlMguuS16mgEsRQjJ3bNGi/f7k3FfeaaV3mFeiW3dQFKQE1fBvcn0S4B3lP4ix qrPN3Z1O2fSFbXMofKdoGL0hiOAI40pqH7qJB+CN/dgCTIdMyo8GZVnq54Vp6rW4MtqI 5eUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=23sC8kdtiHWrAvH9E3iiXK6MRXIah97kJUhFH8UMkp8=; b=uocHtbmMn67tjueJ0pyu1dc7AKiIhenby/4pHnFxtcCi5EJI2k2JVrMf0MJ0s84apR KqRbMdWJa/lA7Ze4bHjHRnZK2EyWXF4o3veMq6yPqe3d9h2S0dEUJ75hm/Bdw+mEceLo 6YE+uZxUv8nDDZq9FXM7zZskF6eAX5ukMu7jTKYS64fkRnsIAn/p+174bjaAOj36jSeK nCDUhhwIYuI5Ef4R9olBpE24XmbFp4OsI2F4iOIWh4gOrAPgvsHotsEHA2BiAoIcM5hY NW/1wIsuM+hqgz7txZemlL4uRmfeA7CZnAxmgAOwGkSb88BuEFJWq83USfg1k6FgYOQ+ XzaQ== X-Gm-Message-State: AGRZ1gK1LB8wmr7KHO/sBl2ATJ3BmC3vP1zld01Dw0ZADc+Vmzm7DHkY xj/3y94mAySlHQApsEgGwEDcwcBa X-Google-Smtp-Source: AJdET5fMbBiBiUEI9h0BrcgrpmvxdqWPY0QedT22UlaR88BJL9YRkJ2FQHz0bd3c+2VN0cEG+Xkk9g== X-Received: by 2002:a62:120b:: with SMTP id a11-v6mr23048996pfj.165.1541444806497; Mon, 05 Nov 2018 11:06:46 -0800 (PST) Received: from desktop.lan (astound-69-42-16-32.ca.astound.net. [69.42.16.32]) by smtp.gmail.com with ESMTPSA id l129-v6sm55872516pfc.155.2018.11.05.11.06.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 11:06:45 -0800 (PST) From: Rosen Penev To: linux-btrfs@vger.kernel.org Subject: [PATCH 1/3] bitops: Fix big endian compilation Date: Mon, 5 Nov 2018 11:06:41 -0800 Message-Id: <20181105190643.13578-1-rosenp@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 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 Replaced bswap with _ variants. While it's a glibc extension, all of the popular libc implementations (glibc, uClibc, musl, BIONIC) seem to support it. Added static inline to two functions to match little endian variants. This fixes a linking error experienced when compiling. Signed-off-by: Rosen Penev Reviewed-by: Nikolay Borisov --- kernel-lib/bitops.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel-lib/bitops.h b/kernel-lib/bitops.h index b1fd6f5..2c51a26 100644 --- a/kernel-lib/bitops.h +++ b/kernel-lib/bitops.h @@ -178,9 +178,9 @@ static inline unsigned long find_next_zero_bit(const unsigned long *addr, static inline unsigned long ext2_swab(const unsigned long y) { #if BITS_PER_LONG == 64 - return (unsigned long) bswap64((u64) y); + return (unsigned long) bswap_64((u64) y); #elif BITS_PER_LONG == 32 - return (unsigned long) bswap32((u32) y); + return (unsigned long) bswap_32((u32) y); #else #error BITS_PER_LONG not defined #endif @@ -218,14 +218,14 @@ static inline unsigned long _find_next_bit_le(const unsigned long *addr1, return min(start + __ffs(ext2_swab(tmp)), nbits); } -unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, +static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset) { return _find_next_bit_le(addr, NULL, size, offset, ~0UL); } -unsigned long find_next_bit_le(const void *addr, unsigned long size, +static inline unsigned long find_next_bit_le(const void *addr, unsigned long size, unsigned long offset) { return _find_next_bit_le(addr, NULL, size, offset, 0UL); From patchwork Mon Nov 5 19:06:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 10668983 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE77F1751 for ; Mon, 5 Nov 2018 19:06:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC0592926B for ; Mon, 5 Nov 2018 19:06:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADA35293C5; Mon, 5 Nov 2018 19:06:50 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 7E539292E2 for ; Mon, 5 Nov 2018 19:06:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387709AbeKFE1w (ORCPT ); Mon, 5 Nov 2018 23:27:52 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:35528 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387460AbeKFE1w (ORCPT ); Mon, 5 Nov 2018 23:27:52 -0500 Received: by mail-pf1-f195.google.com with SMTP id v9-v6so2573984pff.2 for ; Mon, 05 Nov 2018 11:06:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Vhx7eYMScFPejpPB1vXQviRFU8zBlgYRSxKYKY86920=; b=GHY53zCTKv9Y60VtwI/J5PrTgAZTNA75puCRI7mqU0aGqfhLzQLKAxu6xlsHofo6dz +eM2ybdwQNJV6o0OKtYZf16j2XOzyGt4VEMwymrmszgNPe1uDQJKQI9qfN8NIfXH2qj5 GC6FObaItXzF2Hhb33a/MU7gDg9q/GViJxTQSB8nQNeN1GC3R/ApHpb4tFohZwElxvEB pf+eH+RKdTvzEVCb2yHJl8VQ9pzn4gniZqU1GXPd/Fz/j0fTULAb/F6NuigEVwzf4y8G ATvw0hizBDaQzI2//oux2mXaG3qbWRBsSLDn8ztunYEsEGT0DhKur0oDqNhOYQh29Uoe r/yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vhx7eYMScFPejpPB1vXQviRFU8zBlgYRSxKYKY86920=; b=kfHB9z3k+t/iGjynnMCJZrvPSxejyAw/ZyZXQ5a/RgXce/28+6sOvqBEp0QsGayuKj mlsSqIcerW+vvpR977AWUjhgRRuocSyHcFCyS39BJDoLyY7FBecE2DZNHI45NAJizlI9 ezmbqSd09W1oXNwsnppxBEd6mz2XQpirt6OC7qBqf2utfBpvFFmrRqA8uWQ+XOCxcKOI e1+VSDR3I+zq0lmaSfpfpN7LU+Zbxu79DPJHzbZ58XWadB4qQWPASLZ8Jdnwfx41ES3E 6JfDdVQN+hrgZKyxFyObA/deWaJTw6ASW4NAf6q0kNyNISNuLA2X7kdkz3bfXL0D0xNi UOLw== X-Gm-Message-State: AGRZ1gK2PhjItDjtBxYBjaxDL/t813XTqe5vRRe0uqVLZ9YFDAEnBeUa hw1HkqIU1p29BZOaDiYqxVtHAWec X-Google-Smtp-Source: AJdET5fmOMo57/v/Bmd49BRYN37ekpBM3CfhyywpHo09QFKkOAEHYvQ+CjsaEjSrIfY1pz1x2snY5A== X-Received: by 2002:a65:664e:: with SMTP id z14-v6mr20402623pgv.347.1541444807634; Mon, 05 Nov 2018 11:06:47 -0800 (PST) Received: from desktop.lan (astound-69-42-16-32.ca.astound.net. [69.42.16.32]) by smtp.gmail.com with ESMTPSA id l129-v6sm55872516pfc.155.2018.11.05.11.06.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 11:06:47 -0800 (PST) From: Rosen Penev To: linux-btrfs@vger.kernel.org Subject: [PATCH 2/3] task-utils: Fix comparison between pointer and integer Date: Mon, 5 Nov 2018 11:06:42 -0800 Message-Id: <20181105190643.13578-2-rosenp@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181105190643.13578-1-rosenp@gmail.com> References: <20181105190643.13578-1-rosenp@gmail.com> MIME-Version: 1.0 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 pthread_t is a pointer type, not an integer one. The > 0 makes no sense and throws a warning. Signed-off-by: Rosen Penev Reviewed-by: Nikolay Borisov --- task-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task-utils.c b/task-utils.c index a9bee8f..e4dcd36 100644 --- a/task-utils.c +++ b/task-utils.c @@ -67,7 +67,7 @@ void task_stop(struct task_info *info) if (!info) return; - if (info->id > 0) { + if (info->id) { pthread_cancel(info->id); pthread_join(info->id, NULL); info->id = 0; From patchwork Mon Nov 5 19:06:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 10668985 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4D88A18FD for ; Mon, 5 Nov 2018 19:06:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E9C3292E2 for ; Mon, 5 Nov 2018 19:06:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 329452994F; Mon, 5 Nov 2018 19:06:52 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 ACE3B292E2 for ; Mon, 5 Nov 2018 19:06:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387832AbeKFE1y (ORCPT ); Mon, 5 Nov 2018 23:27:54 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:43447 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387460AbeKFE1y (ORCPT ); Mon, 5 Nov 2018 23:27:54 -0500 Received: by mail-pl1-f193.google.com with SMTP id g59-v6so4901147plb.10 for ; Mon, 05 Nov 2018 11:06:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=/LLAzwDdf029f9ZYZFA/k+FXhQvuzZNd6afJSDCwhKM=; b=DKJWmtCuA+wHaZfnDGdBf6HztdBXZ4DJaTMtE3ke51y5VQH+cEPBqJXsN/oDra8xy8 3D0YuXGxEdBLTsfsLvmg5E7kNky14HCClOX1AaVRRck77So4uiXK3IP5wSjBeynKiw9d mMA7se5eSrVdM5gVIGnKL7XesBMHyPtFsVt9jdkcI8F04VnT/4+2L7UdSyRtudr8uq4W wuUYu9YxZ13LIepsJLp3GX9+/Q0WzA+swmyx8vQeIOVR+tSew/KsXbbJrfGmdG3gq0kE UyWPWOqV++IvNYxLpQx79VDIsW/cMCd46VilvugCtveFwjCeAhGpkkf2QH6ng72IRh6L GF0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/LLAzwDdf029f9ZYZFA/k+FXhQvuzZNd6afJSDCwhKM=; b=iAzJjh3p6E+GZzy0q5TTl6w5uBFNgB9CSVZKu1J3GDSMJ4dxJB8yRSUa6fynqujA2B gHzf7hqSjIM9mw+9bZBaO/Uk4aqri6maTo3W6Yl80eppAd3/UmS2nbUNOgRvOVGBabCt y45qRB0QBvQRag8LpcKCAEDZfYy4Uc8emq0IjD72VZSdNsrwaKLKmzCJPUFuwE06lN9g PRsXVzWFTa+LZTAgIUoFd+GXX0VUXYRnxqq9qGsHLPXEnWaqEcjvVQ2FspuWehw9iRd5 NFUMhvzYygu9rHgw/nJJo3EsxMtFjtI3m+ukEKaEqjBc4+pMNv7VGvtwTl3xHpakTgiF OTxg== X-Gm-Message-State: AGRZ1gLImJuZTdQ09cE7XGHKQjmBchXfHzmLiCqCeVlQHUuAlP28tnZM khqh1gm0HKv5ft0GgQB/ZIoBzfkg X-Google-Smtp-Source: AJdET5dSKH961RGUJmpsySKvgGzV1ttqDPRw0Uu9Cc2ooiY5YlQZQp/RlSpVywgq6GfWhocHH48Xvg== X-Received: by 2002:a17:902:bf0c:: with SMTP id bi12-v6mr23825809plb.330.1541444808774; Mon, 05 Nov 2018 11:06:48 -0800 (PST) Received: from desktop.lan (astound-69-42-16-32.ca.astound.net. [69.42.16.32]) by smtp.gmail.com with ESMTPSA id l129-v6sm55872516pfc.155.2018.11.05.11.06.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 11:06:47 -0800 (PST) From: Rosen Penev To: linux-btrfs@vger.kernel.org Subject: [PATCH 3/3] treewide: Fix missing declarations Date: Mon, 5 Nov 2018 11:06:43 -0800 Message-Id: <20181105190643.13578-3-rosenp@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181105190643.13578-1-rosenp@gmail.com> References: <20181105190643.13578-1-rosenp@gmail.com> MIME-Version: 1.0 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 Found using -Wmissing-prototypes in GCC. This should improve LTO behavior. Note that set_free_space_tree_thresholds is an unused function. Adding inline seems to remove the unused function warning. Signed-off-by: Rosen Penev Reviewed-by: Nikolay Borisov --- btrfs.c | 2 +- check/mode-lowmem.c | 2 +- extent-tree.c | 2 +- free-space-tree.c | 12 ++++++------ libbtrfsutil/stubs.c | 1 + utils-lib.c | 2 ++ utils.h | 1 + 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/btrfs.c b/btrfs.c index 2d39f2c..78c468d 100644 --- a/btrfs.c +++ b/btrfs.c @@ -210,7 +210,7 @@ static int handle_global_options(int argc, char **argv) return shift; } -void handle_special_globals(int shift, int argc, char **argv) +static void handle_special_globals(int shift, int argc, char **argv) { int has_help = 0; int has_full = 0; diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index 14bbc9e..94123c1 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -953,7 +953,7 @@ out: * returns 0 means success. * returns not 0 means on error; */ -int repair_ternary_lowmem(struct btrfs_root *root, u64 dir_ino, u64 ino, +static int repair_ternary_lowmem(struct btrfs_root *root, u64 dir_ino, u64 ino, u64 index, char *name, int name_len, u8 filetype, int err) { diff --git a/extent-tree.c b/extent-tree.c index cd98633..8c9cdef 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -3749,7 +3749,7 @@ static void __get_extent_size(struct btrfs_root *root, struct btrfs_path *path, * Return >0 for not found. * Return <0 for err */ -int btrfs_search_overlap_extent(struct btrfs_root *root, +static int btrfs_search_overlap_extent(struct btrfs_root *root, struct btrfs_path *path, u64 bytenr, u64 len) { struct btrfs_key key; diff --git a/free-space-tree.c b/free-space-tree.c index 6641cdf..6ef5792 100644 --- a/free-space-tree.c +++ b/free-space-tree.c @@ -24,7 +24,7 @@ #include "bitops.h" #include "internal.h" -void set_free_space_tree_thresholds(struct btrfs_block_group_cache *cache, +static inline void set_free_space_tree_thresholds(struct btrfs_block_group_cache *cache, u64 sectorsize) { u32 bitmap_range; @@ -202,7 +202,7 @@ static void le_bitmap_set(unsigned long *map, unsigned int start, int len) } } -int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans, +static int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans, struct btrfs_block_group_cache *block_group, struct btrfs_path *path) { @@ -341,7 +341,7 @@ out: return ret; } -int convert_free_space_to_extents(struct btrfs_trans_handle *trans, +static int convert_free_space_to_extents(struct btrfs_trans_handle *trans, struct btrfs_block_group_cache *block_group, struct btrfs_path *path) { @@ -780,7 +780,7 @@ out: return ret; } -int __remove_from_free_space_tree(struct btrfs_trans_handle *trans, +static int __remove_from_free_space_tree(struct btrfs_trans_handle *trans, struct btrfs_block_group_cache *block_group, struct btrfs_path *path, u64 start, u64 size) { @@ -960,7 +960,7 @@ out: return ret; } -int __add_to_free_space_tree(struct btrfs_trans_handle *trans, +static int __add_to_free_space_tree(struct btrfs_trans_handle *trans, struct btrfs_block_group_cache *block_group, struct btrfs_path *path, u64 start, u64 size) { @@ -1420,7 +1420,7 @@ out: return ret; } -struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, +static struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info, u64 objectid) { diff --git a/libbtrfsutil/stubs.c b/libbtrfsutil/stubs.c index 9b9e037..c530e40 100644 --- a/libbtrfsutil/stubs.c +++ b/libbtrfsutil/stubs.c @@ -19,6 +19,7 @@ #include #include +#include "stubs.h" void *reallocarray(void *ptr, size_t nmemb, size_t size) { diff --git a/utils-lib.c b/utils-lib.c index 044f93f..2ac421b 100644 --- a/utils-lib.c +++ b/utils-lib.c @@ -5,6 +5,8 @@ #include #include +#include "utils.h" + #if BTRFS_FLAT_INCLUDES #include "ctree.h" #else diff --git a/utils.h b/utils.h index b6c00cf..7c5eb79 100644 --- a/utils.h +++ b/utils.h @@ -29,6 +29,7 @@ #include "sizes.h" #include "messages.h" #include "ioctl.h" +#include "fsfeatures.h" #define BTRFS_SCAN_MOUNTED (1ULL << 0) #define BTRFS_SCAN_LBLKID (1ULL << 1)