[PATCH] btrfs-progs: Cleanup warning reported by -Wmissing-prototypes except free space tree

[PATCH] btrfs-progs: Cleanup warning reported by -Wmissing-prototypes except free space tree

[Qu Wenruo]

The following missing prototypes will be fixed:
1) btrfs.c::handle_special_globals()
2) check/mode-lowmem.c::repair_ternary_lowmem()
3) extent-tree.c::btrfs_search_overlap_extent()
   Above 3 can be fixed by making them static

4) utils.c::btrfs_check_nodesize()
   Fixed by moving it to fsfeatures.c

5) chunk-recover.c::btrfs_recover_chunk_tree()
6) super-recover.c::btrfs_recover_superblocks()
   Fixed by moving the declaration from cmds-rescue.c to rescue.h

7) utils-lib.c::arg_strtou64()
7) utils-lib.c::lookup_path_rootid()
   Fixed by include "utils.h"

Free space tree is left untouched, as some unused functions are there
for later write support.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 btrfs.c             |  2 +-
 check/mode-lowmem.c |  6 +++---
 chunk-recover.c     |  1 +
 cmds-rescue.c       |  4 +---
 extent-tree.c       |  2 +-
 fsfeatures.c        | 22 ++++++++++++++++++++++
 rescue.h            | 14 ++++++++++++++
 super-recover.c     |  1 +
 utils-lib.c         |  1 +
 utils.c             | 23 -----------------------
 10 files changed, 45 insertions(+), 31 deletions(-)
 create mode 100644 rescue.h

diff --git a/btrfs.c b/btrfs.c
index 2d39f2ced3e8..78c468d2e050 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 14bbc9ee6cb6..f56b5e8d45dc 100644
--- a/check/mode-lowmem.c
+++ b/check/mode-lowmem.c
@@ -953,9 +953,9 @@ out:
  * returns 0 means success.
  * returns not 0 means on error;
  */
-int repair_ternary_lowmem(struct btrfs_root *root, u64 dir_ino, u64 ino,
-			  u64 index, char *name, int name_len, u8 filetype,
-			  int err)
+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)
 {
 	struct btrfs_trans_handle *trans;
 	int stage = 0;
diff --git a/chunk-recover.c b/chunk-recover.c
index 1d30db51d8ed..1e554b8e8750 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -40,6 +40,7 @@
 #include "utils.h"
 #include "btrfsck.h"
 #include "commands.h"
+#include "rescue.h"
 
 struct recover_control {
 	int verbose;
diff --git a/cmds-rescue.c b/cmds-rescue.c
index 2bc50c0841ed..36e9e1277e40 100644
--- a/cmds-rescue.c
+++ b/cmds-rescue.c
@@ -26,15 +26,13 @@
 #include "commands.h"
 #include "utils.h"
 #include "help.h"
+#include "rescue.h"
 
 static const char * const rescue_cmd_group_usage[] = {
 	"btrfs rescue <command> [options] <path>",
 	NULL
 };
 
-int btrfs_recover_chunk_tree(const char *path, int verbose, int yes);
-int btrfs_recover_superblocks(const char *path, int verbose, int yes);
-
 static const char * const cmd_rescue_chunk_recover_usage[] = {
 	"btrfs rescue chunk-recover [options] <device>",
 	"Recover the chunk tree by scanning the devices one by one.",
diff --git a/extent-tree.c b/extent-tree.c
index cd98633992ac..8c9cdeff3b02 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/fsfeatures.c b/fsfeatures.c
index 7d85d60f1277..201d0f576688 100644
--- a/fsfeatures.c
+++ b/fsfeatures.c
@@ -225,3 +225,25 @@ u32 get_running_kernel_version(void)
 	return version;
 }
 
+int btrfs_check_nodesize(u32 nodesize, u32 sectorsize, u64 features)
+{
+	if (nodesize < sectorsize) {
+		error("illegal nodesize %u (smaller than %u)",
+				nodesize, sectorsize);
+		return -1;
+	} else if (nodesize > BTRFS_MAX_METADATA_BLOCKSIZE) {
+		error("illegal nodesize %u (larger than %u)",
+			nodesize, BTRFS_MAX_METADATA_BLOCKSIZE);
+		return -1;
+	} else if (nodesize & (sectorsize - 1)) {
+		error("illegal nodesize %u (not aligned to %u)",
+			nodesize, sectorsize);
+		return -1;
+	} else if (features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS &&
+		   nodesize != sectorsize) {
+		error("illegal nodesize %u (not equal to %u for mixed block group)",
+			nodesize, sectorsize);
+		return -1;
+	}
+	return 0;
+}
diff --git a/rescue.h b/rescue.h
new file mode 100644
index 000000000000..c9f6e7b80b16
--- /dev/null
+++ b/rescue.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2018 SUSE.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License v2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+int btrfs_recover_superblocks(const char *path, int verbose, int yes);
+int btrfs_recover_chunk_tree(const char *path, int verbose, int yes);
diff --git a/super-recover.c b/super-recover.c
index 86b3df9867dc..a1af71786034 100644
--- a/super-recover.c
+++ b/super-recover.c
@@ -34,6 +34,7 @@
 #include "crc32c.h"
 #include "volumes.h"
 #include "commands.h"
+#include "rescue.h"
 
 struct btrfs_recover_superblock {
 	struct btrfs_fs_devices *fs_devices;
diff --git a/utils-lib.c b/utils-lib.c
index 044f93fc4446..5bb89f2f1a8d 100644
--- a/utils-lib.c
+++ b/utils-lib.c
@@ -1,4 +1,5 @@
 #include "kerncompat.h"
+#include "utils.h"
 #include <unistd.h>
 #include <stdlib.h>
 #include <limits.h>
diff --git a/utils.c b/utils.c
index a310300829eb..607a14e8f287 100644
--- a/utils.c
+++ b/utils.c
@@ -2252,29 +2252,6 @@ int btrfs_tree_search2_ioctl_supported(int fd)
 	return ret;
 }
 
-int btrfs_check_nodesize(u32 nodesize, u32 sectorsize, u64 features)
-{
-	if (nodesize < sectorsize) {
-		error("illegal nodesize %u (smaller than %u)",
-				nodesize, sectorsize);
-		return -1;
-	} else if (nodesize > BTRFS_MAX_METADATA_BLOCKSIZE) {
-		error("illegal nodesize %u (larger than %u)",
-			nodesize, BTRFS_MAX_METADATA_BLOCKSIZE);
-		return -1;
-	} else if (nodesize & (sectorsize - 1)) {
-		error("illegal nodesize %u (not aligned to %u)",
-			nodesize, sectorsize);
-		return -1;
-	} else if (features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS &&
-		   nodesize != sectorsize) {
-		error("illegal nodesize %u (not equal to %u for mixed block group)",
-			nodesize, sectorsize);
-		return -1;
-	}
-	return 0;
-}
-
 /*
  * Copy a path argument from SRC to DEST and check the SRC length if it's at
  * most PATH_MAX and fits into DEST. DESTLEN is supposed to be exact size of
-- 
2.19.1

Re: [PATCH] btrfs-progs: Cleanup warning reported by -Wmissing-prototypes except free space tree

[Nikolay Borisov]

On 16.11.18 г. 8:13 ч., Qu Wenruo wrote:
> The following missing prototypes will be fixed:
> 1) btrfs.c::handle_special_globals()
> 2) check/mode-lowmem.c::repair_ternary_lowmem()
> 3) extent-tree.c::btrfs_search_overlap_extent()
>    Above 3 can be fixed by making them static
> 
> 4) utils.c::btrfs_check_nodesize()
>    Fixed by moving it to fsfeatures.c
> 
> 5) chunk-recover.c::btrfs_recover_chunk_tree()
> 6) super-recover.c::btrfs_recover_superblocks()
>    Fixed by moving the declaration from cmds-rescue.c to rescue.h
> 
> 7) utils-lib.c::arg_strtou64()
> 7) utils-lib.c::lookup_path_rootid()
>    Fixed by include "utils.h"
> 
> Free space tree is left untouched, as some unused functions are there
> for later write support.

Hm, I think freespace tree is more or less done, what else is there?
There is one function in there: set_free_space_tree_thresholds which i
think could be removed, can't remember why I backported it. And there
were some other that could just be made static.

> 
> Signed-off-by: Qu Wenruo <wqu@suse.com>
> ---
>  btrfs.c             |  2 +-
>  check/mode-lowmem.c |  6 +++---
>  chunk-recover.c     |  1 +
>  cmds-rescue.c       |  4 +---
>  extent-tree.c       |  2 +-
>  fsfeatures.c        | 22 ++++++++++++++++++++++
>  rescue.h            | 14 ++++++++++++++
>  super-recover.c     |  1 +
>  utils-lib.c         |  1 +
>  utils.c             | 23 -----------------------
>  10 files changed, 45 insertions(+), 31 deletions(-)
>  create mode 100644 rescue.h
> 
> diff --git a/btrfs.c b/btrfs.c
> index 2d39f2ced3e8..78c468d2e050 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 14bbc9ee6cb6..f56b5e8d45dc 100644
> --- a/check/mode-lowmem.c
> +++ b/check/mode-lowmem.c
> @@ -953,9 +953,9 @@ out:
>   * returns 0 means success.
>   * returns not 0 means on error;
>   */
> -int repair_ternary_lowmem(struct btrfs_root *root, u64 dir_ino, u64 ino,
> -			  u64 index, char *name, int name_len, u8 filetype,
> -			  int err)
> +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)
>  {
>  	struct btrfs_trans_handle *trans;
>  	int stage = 0;
> diff --git a/chunk-recover.c b/chunk-recover.c
> index 1d30db51d8ed..1e554b8e8750 100644
> --- a/chunk-recover.c
> +++ b/chunk-recover.c
> @@ -40,6 +40,7 @@
>  #include "utils.h"
>  #include "btrfsck.h"
>  #include "commands.h"
> +#include "rescue.h"
>  
>  struct recover_control {
>  	int verbose;
> diff --git a/cmds-rescue.c b/cmds-rescue.c
> index 2bc50c0841ed..36e9e1277e40 100644
> --- a/cmds-rescue.c
> +++ b/cmds-rescue.c
> @@ -26,15 +26,13 @@
>  #include "commands.h"
>  #include "utils.h"
>  #include "help.h"
> +#include "rescue.h"
>  
>  static const char * const rescue_cmd_group_usage[] = {
>  	"btrfs rescue <command> [options] <path>",
>  	NULL
>  };
>  
> -int btrfs_recover_chunk_tree(const char *path, int verbose, int yes);
> -int btrfs_recover_superblocks(const char *path, int verbose, int yes);
> -
>  static const char * const cmd_rescue_chunk_recover_usage[] = {
>  	"btrfs rescue chunk-recover [options] <device>",
>  	"Recover the chunk tree by scanning the devices one by one.",
> diff --git a/extent-tree.c b/extent-tree.c
> index cd98633992ac..8c9cdeff3b02 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/fsfeatures.c b/fsfeatures.c
> index 7d85d60f1277..201d0f576688 100644
> --- a/fsfeatures.c
> +++ b/fsfeatures.c
> @@ -225,3 +225,25 @@ u32 get_running_kernel_version(void)
>  	return version;
>  }
>  
> +int btrfs_check_nodesize(u32 nodesize, u32 sectorsize, u64 features)
> +{
> +	if (nodesize < sectorsize) {
> +		error("illegal nodesize %u (smaller than %u)",
> +				nodesize, sectorsize);
> +		return -1;
> +	} else if (nodesize > BTRFS_MAX_METADATA_BLOCKSIZE) {
> +		error("illegal nodesize %u (larger than %u)",
> +			nodesize, BTRFS_MAX_METADATA_BLOCKSIZE);
> +		return -1;
> +	} else if (nodesize & (sectorsize - 1)) {
> +		error("illegal nodesize %u (not aligned to %u)",
> +			nodesize, sectorsize);
> +		return -1;
> +	} else if (features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS &&
> +		   nodesize != sectorsize) {
> +		error("illegal nodesize %u (not equal to %u for mixed block group)",
> +			nodesize, sectorsize);
> +		return -1;
> +	}
> +	return 0;
> +}
> diff --git a/rescue.h b/rescue.h
> new file mode 100644
> index 000000000000..c9f6e7b80b16
> --- /dev/null
> +++ b/rescue.h
> @@ -0,0 +1,14 @@
> +/*
> + * Copyright (C) 2018 SUSE.  All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public
> + * License v2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * General Public License for more details.
> + */
> +int btrfs_recover_superblocks(const char *path, int verbose, int yes);
> +int btrfs_recover_chunk_tree(const char *path, int verbose, int yes);
> diff --git a/super-recover.c b/super-recover.c
> index 86b3df9867dc..a1af71786034 100644
> --- a/super-recover.c
> +++ b/super-recover.c
> @@ -34,6 +34,7 @@
>  #include "crc32c.h"
>  #include "volumes.h"
>  #include "commands.h"
> +#include "rescue.h"
>  
>  struct btrfs_recover_superblock {
>  	struct btrfs_fs_devices *fs_devices;
> diff --git a/utils-lib.c b/utils-lib.c
> index 044f93fc4446..5bb89f2f1a8d 100644
> --- a/utils-lib.c
> +++ b/utils-lib.c
> @@ -1,4 +1,5 @@
>  #include "kerncompat.h"
> +#include "utils.h"
>  #include <unistd.h>
>  #include <stdlib.h>
>  #include <limits.h>
> diff --git a/utils.c b/utils.c
> index a310300829eb..607a14e8f287 100644
> --- a/utils.c
> +++ b/utils.c
> @@ -2252,29 +2252,6 @@ int btrfs_tree_search2_ioctl_supported(int fd)
>  	return ret;
>  }
>  
> -int btrfs_check_nodesize(u32 nodesize, u32 sectorsize, u64 features)
> -{
> -	if (nodesize < sectorsize) {
> -		error("illegal nodesize %u (smaller than %u)",
> -				nodesize, sectorsize);
> -		return -1;
> -	} else if (nodesize > BTRFS_MAX_METADATA_BLOCKSIZE) {
> -		error("illegal nodesize %u (larger than %u)",
> -			nodesize, BTRFS_MAX_METADATA_BLOCKSIZE);
> -		return -1;
> -	} else if (nodesize & (sectorsize - 1)) {
> -		error("illegal nodesize %u (not aligned to %u)",
> -			nodesize, sectorsize);
> -		return -1;
> -	} else if (features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS &&
> -		   nodesize != sectorsize) {
> -		error("illegal nodesize %u (not equal to %u for mixed block group)",
> -			nodesize, sectorsize);
> -		return -1;
> -	}
> -	return 0;
> -}
> -
>  /*
>   * Copy a path argument from SRC to DEST and check the SRC length if it's at
>   * most PATH_MAX and fits into DEST. DESTLEN is supposed to be exact size of
> 

Re: [PATCH] btrfs-progs: Cleanup warning reported by -Wmissing-prototypes except free space tree

[Qu Wenruo]

On 2018/11/16 下午2:39, Nikolay Borisov wrote:
> 
> 
> On 16.11.18 г. 8:13 ч., Qu Wenruo wrote:
>> The following missing prototypes will be fixed:
>> 1) btrfs.c::handle_special_globals()
>> 2) check/mode-lowmem.c::repair_ternary_lowmem()
>> 3) extent-tree.c::btrfs_search_overlap_extent()
>>    Above 3 can be fixed by making them static
>>
>> 4) utils.c::btrfs_check_nodesize()
>>    Fixed by moving it to fsfeatures.c
>>
>> 5) chunk-recover.c::btrfs_recover_chunk_tree()
>> 6) super-recover.c::btrfs_recover_superblocks()
>>    Fixed by moving the declaration from cmds-rescue.c to rescue.h
>>
>> 7) utils-lib.c::arg_strtou64()
>> 7) utils-lib.c::lookup_path_rootid()
>>    Fixed by include "utils.h"
>>
>> Free space tree is left untouched, as some unused functions are there
>> for later write support.
> 
> Hm, I think freespace tree is more or less done,

That's great, I could cut some code out.

> what else is there?
> There is one function in there: set_free_space_tree_thresholds which i
> think could be removed, can't remember why I backported it. And there
> were some other that could just be made static.

That's the full output for free-space-tree.

free-space-tree.c:27:6: warning: no previous prototype for
'set_free_space_tree_thresholds' [-Wmissing-prototypes]
 void set_free_space_tree_thresholds(struct btrfs_block_group_cache *cache,
      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
free-space-tree.c:205:5: warning: no previous prototype for
'convert_free_space_to_bitmaps' [-Wmissing-prototypes]
 int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
free-space-tree.c:344:5: warning: no previous prototype for
'convert_free_space_to_extents' [-Wmissing-prototypes]
 int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
free-space-tree.c:783:5: warning: no previous prototype for
'__remove_from_free_space_tree' [-Wmissing-prototypes]
 int __remove_from_free_space_tree(struct btrfs_trans_handle *trans,
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
free-space-tree.c:963:5: warning: no previous prototype for
'__add_to_free_space_tree' [-Wmissing-prototypes]
 int __add_to_free_space_tree(struct btrfs_trans_handle *trans,
     ^~~~~~~~~~~~~~~~~~~~~~~~
free-space-tree.c:1423:20: warning: no previous prototype for
'btrfs_create_tree' [-Wmissing-prototypes]
 struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,
                    ^~~~~~~~~~~~~~~~~

I'll update these in v2.

Thanks,
Qu


> 
>>
>> Signed-off-by: Qu Wenruo <wqu@suse.com>
>> ---
>>  btrfs.c             |  2 +-
>>  check/mode-lowmem.c |  6 +++---
>>  chunk-recover.c     |  1 +
>>  cmds-rescue.c       |  4 +---
>>  extent-tree.c       |  2 +-
>>  fsfeatures.c        | 22 ++++++++++++++++++++++
>>  rescue.h            | 14 ++++++++++++++
>>  super-recover.c     |  1 +
>>  utils-lib.c         |  1 +
>>  utils.c             | 23 -----------------------
>>  10 files changed, 45 insertions(+), 31 deletions(-)
>>  create mode 100644 rescue.h
>>
>> diff --git a/btrfs.c b/btrfs.c
>> index 2d39f2ced3e8..78c468d2e050 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 14bbc9ee6cb6..f56b5e8d45dc 100644
>> --- a/check/mode-lowmem.c
>> +++ b/check/mode-lowmem.c
>> @@ -953,9 +953,9 @@ out:
>>   * returns 0 means success.
>>   * returns not 0 means on error;
>>   */
>> -int repair_ternary_lowmem(struct btrfs_root *root, u64 dir_ino, u64 ino,
>> -			  u64 index, char *name, int name_len, u8 filetype,
>> -			  int err)
>> +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)
>>  {
>>  	struct btrfs_trans_handle *trans;
>>  	int stage = 0;
>> diff --git a/chunk-recover.c b/chunk-recover.c
>> index 1d30db51d8ed..1e554b8e8750 100644
>> --- a/chunk-recover.c
>> +++ b/chunk-recover.c
>> @@ -40,6 +40,7 @@
>>  #include "utils.h"
>>  #include "btrfsck.h"
>>  #include "commands.h"
>> +#include "rescue.h"
>>  
>>  struct recover_control {
>>  	int verbose;
>> diff --git a/cmds-rescue.c b/cmds-rescue.c
>> index 2bc50c0841ed..36e9e1277e40 100644
>> --- a/cmds-rescue.c
>> +++ b/cmds-rescue.c
>> @@ -26,15 +26,13 @@
>>  #include "commands.h"
>>  #include "utils.h"
>>  #include "help.h"
>> +#include "rescue.h"
>>  
>>  static const char * const rescue_cmd_group_usage[] = {
>>  	"btrfs rescue <command> [options] <path>",
>>  	NULL
>>  };
>>  
>> -int btrfs_recover_chunk_tree(const char *path, int verbose, int yes);
>> -int btrfs_recover_superblocks(const char *path, int verbose, int yes);
>> -
>>  static const char * const cmd_rescue_chunk_recover_usage[] = {
>>  	"btrfs rescue chunk-recover [options] <device>",
>>  	"Recover the chunk tree by scanning the devices one by one.",
>> diff --git a/extent-tree.c b/extent-tree.c
>> index cd98633992ac..8c9cdeff3b02 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/fsfeatures.c b/fsfeatures.c
>> index 7d85d60f1277..201d0f576688 100644
>> --- a/fsfeatures.c
>> +++ b/fsfeatures.c
>> @@ -225,3 +225,25 @@ u32 get_running_kernel_version(void)
>>  	return version;
>>  }
>>  
>> +int btrfs_check_nodesize(u32 nodesize, u32 sectorsize, u64 features)
>> +{
>> +	if (nodesize < sectorsize) {
>> +		error("illegal nodesize %u (smaller than %u)",
>> +				nodesize, sectorsize);
>> +		return -1;
>> +	} else if (nodesize > BTRFS_MAX_METADATA_BLOCKSIZE) {
>> +		error("illegal nodesize %u (larger than %u)",
>> +			nodesize, BTRFS_MAX_METADATA_BLOCKSIZE);
>> +		return -1;
>> +	} else if (nodesize & (sectorsize - 1)) {
>> +		error("illegal nodesize %u (not aligned to %u)",
>> +			nodesize, sectorsize);
>> +		return -1;
>> +	} else if (features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS &&
>> +		   nodesize != sectorsize) {
>> +		error("illegal nodesize %u (not equal to %u for mixed block group)",
>> +			nodesize, sectorsize);
>> +		return -1;
>> +	}
>> +	return 0;
>> +}
>> diff --git a/rescue.h b/rescue.h
>> new file mode 100644
>> index 000000000000..c9f6e7b80b16
>> --- /dev/null
>> +++ b/rescue.h
>> @@ -0,0 +1,14 @@
>> +/*
>> + * Copyright (C) 2018 SUSE.  All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU General Public
>> + * License v2 as published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>> + * General Public License for more details.
>> + */
>> +int btrfs_recover_superblocks(const char *path, int verbose, int yes);
>> +int btrfs_recover_chunk_tree(const char *path, int verbose, int yes);
>> diff --git a/super-recover.c b/super-recover.c
>> index 86b3df9867dc..a1af71786034 100644
>> --- a/super-recover.c
>> +++ b/super-recover.c
>> @@ -34,6 +34,7 @@
>>  #include "crc32c.h"
>>  #include "volumes.h"
>>  #include "commands.h"
>> +#include "rescue.h"
>>  
>>  struct btrfs_recover_superblock {
>>  	struct btrfs_fs_devices *fs_devices;
>> diff --git a/utils-lib.c b/utils-lib.c
>> index 044f93fc4446..5bb89f2f1a8d 100644
>> --- a/utils-lib.c
>> +++ b/utils-lib.c
>> @@ -1,4 +1,5 @@
>>  #include "kerncompat.h"
>> +#include "utils.h"
>>  #include <unistd.h>
>>  #include <stdlib.h>
>>  #include <limits.h>
>> diff --git a/utils.c b/utils.c
>> index a310300829eb..607a14e8f287 100644
>> --- a/utils.c
>> +++ b/utils.c
>> @@ -2252,29 +2252,6 @@ int btrfs_tree_search2_ioctl_supported(int fd)
>>  	return ret;
>>  }
>>  
>> -int btrfs_check_nodesize(u32 nodesize, u32 sectorsize, u64 features)
>> -{
>> -	if (nodesize < sectorsize) {
>> -		error("illegal nodesize %u (smaller than %u)",
>> -				nodesize, sectorsize);
>> -		return -1;
>> -	} else if (nodesize > BTRFS_MAX_METADATA_BLOCKSIZE) {
>> -		error("illegal nodesize %u (larger than %u)",
>> -			nodesize, BTRFS_MAX_METADATA_BLOCKSIZE);
>> -		return -1;
>> -	} else if (nodesize & (sectorsize - 1)) {
>> -		error("illegal nodesize %u (not aligned to %u)",
>> -			nodesize, sectorsize);
>> -		return -1;
>> -	} else if (features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS &&
>> -		   nodesize != sectorsize) {
>> -		error("illegal nodesize %u (not equal to %u for mixed block group)",
>> -			nodesize, sectorsize);
>> -		return -1;
>> -	}
>> -	return 0;
>> -}
>> -
>>  /*
>>   * Copy a path argument from SRC to DEST and check the SRC length if it's at
>>   * most PATH_MAX and fits into DEST. DESTLEN is supposed to be exact size of
>>