[PATCH] libxfs: remove duplicate rtalloc declarations in libxfs.h

[PATCH] libxfs: remove duplicate rtalloc declarations in libxfs.h

[Christoph Hellwig]

These already come from xfs_rtbitmap.h.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/libxfs.h         |  5 -----
 man/man8/xfs_scrub_all.8 | 42 ----------------------------------------
 2 files changed, 47 deletions(-)
 delete mode 100644 man/man8/xfs_scrub_all.8

diff --git a/include/libxfs.h b/include/libxfs.h
index fb8efb696..40e41ea77 100644
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -220,11 +220,6 @@ libxfs_bmbt_disk_get_all(
 		irec->br_state = XFS_EXT_NORM;
 }
 
-/* XXX: this is clearly a bug - a shared header needs to export this */
-/* xfs_rtalloc.c */
-int libxfs_rtfree_extent(struct xfs_trans *, xfs_rtblock_t, xfs_extlen_t);
-bool libxfs_verify_rtbno(struct xfs_mount *mp, xfs_rtblock_t rtbno);
-
 #include "xfs_attr.h"
 #include "topology.h"
 
diff --git a/man/man8/xfs_scrub_all.8 b/man/man8/xfs_scrub_all.8
deleted file mode 100644
index 74548802e..000000000
--- a/man/man8/xfs_scrub_all.8
+++ /dev/null
@@ -1,42 +0,0 @@
-.TH xfs_scrub_all 8
-.SH NAME
-xfs_scrub_all \- scrub all mounted XFS filesystems
-.SH SYNOPSIS
-.B xfs_scrub_all
-[
-.B \-hV
-]
-.SH DESCRIPTION
-.B xfs_scrub_all
-attempts to read and check all the metadata on all mounted XFS filesystems.
-The online scrub is performed via the
-.B xfs_scrub
-tool, either by running it directly or by using systemd to start it
-in a restricted fashion.
-Mounted filesystems are mapped to physical storage devices so that scrub
-operations can be run in parallel so long as no two scrubbers access
-the same device simultaneously.
-.SH OPTIONS
-.TP
-.B \-h
-Display help.
-.TP
-.B \-V
-Prints the version number and exits.
-.SH EXIT CODE
-The exit code returned by
-.B xfs_scrub_all
-is the sum of the following conditions:
-.br
-\	0\	\-\ No errors
-.br
-\	4\	\-\ File system errors left uncorrected
-.br
-\	8\	\-\ Operational error
-.br
-\	16\	\-\ Usage or syntax error
-.TP
-These are the same error codes returned by xfs_scrub.
-.br
-.SH SEE ALSO
-.BR xfs_scrub (8).
-- 
2.43.0

Re: [PATCH] libxfs: remove duplicate rtalloc declarations in libxfs.h

[Dave Chinner]

On Tue, Jul 09, 2024 at 08:44:01AM +0200, Christoph Hellwig wrote:
> These already come from xfs_rtbitmap.h.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  include/libxfs.h         |  5 -----
>  man/man8/xfs_scrub_all.8 | 42 ----------------------------------------
>  2 files changed, 47 deletions(-)
>  delete mode 100644 man/man8/xfs_scrub_all.8
> 
> diff --git a/include/libxfs.h b/include/libxfs.h
> index fb8efb696..40e41ea77 100644
> --- a/include/libxfs.h
> +++ b/include/libxfs.h
> @@ -220,11 +220,6 @@ libxfs_bmbt_disk_get_all(
>  		irec->br_state = XFS_EXT_NORM;
>  }
>  
> -/* XXX: this is clearly a bug - a shared header needs to export this */
> -/* xfs_rtalloc.c */
> -int libxfs_rtfree_extent(struct xfs_trans *, xfs_rtblock_t, xfs_extlen_t);
> -bool libxfs_verify_rtbno(struct xfs_mount *mp, xfs_rtblock_t rtbno);
> -
>  #include "xfs_attr.h"
>  #include "topology.h"
>  
> diff --git a/man/man8/xfs_scrub_all.8 b/man/man8/xfs_scrub_all.8
> deleted file mode 100644
> index 74548802e..000000000
> --- a/man/man8/xfs_scrub_all.8
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -.TH xfs_scrub_all 8
> -.SH NAME
> -xfs_scrub_all \- scrub all mounted XFS filesystems
> -.SH SYNOPSIS
> -.B xfs_scrub_all
> -[
> -.B \-hV
> -]
> -.SH DESCRIPTION
> -.B xfs_scrub_all
> -attempts to read and check all the metadata on all mounted XFS filesystems.
> -The online scrub is performed via the
> -.B xfs_scrub
> -tool, either by running it directly or by using systemd to start it
> -in a restricted fashion.
> -Mounted filesystems are mapped to physical storage devices so that scrub
> -operations can be run in parallel so long as no two scrubbers access
> -the same device simultaneously.
> -.SH OPTIONS
> -.TP
> -.B \-h
> -Display help.
> -.TP
> -.B \-V
> -Prints the version number and exits.
> -.SH EXIT CODE
> -The exit code returned by
> -.B xfs_scrub_all
> -is the sum of the following conditions:
> -.br
> -\	0\	\-\ No errors
> -.br
> -\	4\	\-\ File system errors left uncorrected
> -.br
> -\	8\	\-\ Operational error
> -.br
> -\	16\	\-\ Usage or syntax error
> -.TP
> -These are the same error codes returned by xfs_scrub.
> -.br
> -.SH SEE ALSO
> -.BR xfs_scrub (8).

Not sure that you meant to remove this man page when cleaning up 
libxfs.h...

-Dave.

-- 
Dave Chinner
david@fromorbit.com

Re: [PATCH] libxfs: remove duplicate rtalloc declarations in libxfs.h

[Christoph Hellwig]

On Tue, Jul 09, 2024 at 05:20:59PM +1000, Dave Chinner wrote:
> Not sure that you meant to remove this man page when cleaning up 
> libxfs.h...

Heh, no. That manpage switches between a checking in file and a generated
one when switching between upstreams for-next and Darrick's patch stack,
and just keeps f&%&ing things up.  I'll respin the patch.