[PATCH] xfs: mark xfs_bmap_set_attrforkoff static

[PATCH] xfs: mark xfs_bmap_set_attrforkoff static

[Christoph Hellwig]

xfs_bmap_set_attrforkoff is only used inside of xfs_bmap.c, so mark it
static.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/libxfs/xfs_bmap.c | 2 +-
 fs/xfs/libxfs/xfs_bmap.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index e0905ad171f0a5..d53afd82e109e5 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -1028,7 +1028,7 @@ xfs_bmap_add_attrfork_local(
 }
 
 /* Set an inode attr fork off based on the format */
-int
+static int
 xfs_bmap_set_attrforkoff(
 	struct xfs_inode	*ip,
 	int			size,
diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h
index 6747e97a794901..66a7b5b755a493 100644
--- a/fs/xfs/libxfs/xfs_bmap.h
+++ b/fs/xfs/libxfs/xfs_bmap.h
@@ -186,7 +186,6 @@ static inline bool xfs_bmap_is_written_extent(struct xfs_bmbt_irec *irec)
 void	xfs_trim_extent(struct xfs_bmbt_irec *irec, xfs_fileoff_t bno,
 		xfs_filblks_t len);
 int	xfs_bmap_add_attrfork(struct xfs_inode *ip, int size, int rsvd);
-int	xfs_bmap_set_attrforkoff(struct xfs_inode *ip, int size, int *version);
 void	xfs_bmap_local_to_extents_empty(struct xfs_trans *tp,
 		struct xfs_inode *ip, int whichfork);
 void	__xfs_bmap_add_free(struct xfs_trans *tp, xfs_fsblock_t bno,
-- 
2.29.2

Re: [PATCH] xfs: mark xfs_bmap_set_attrforkoff static

[Darrick J. Wong]

On Thu, Feb 25, 2021 at 09:13:55AM +0100, Christoph Hellwig wrote:
> xfs_bmap_set_attrforkoff is only used inside of xfs_bmap.c, so mark it
> static.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks fine, assuming you're all fine with Dave's other patch to
initialize attr forks when ACLs are turned on?

Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> ---
>  fs/xfs/libxfs/xfs_bmap.c | 2 +-
>  fs/xfs/libxfs/xfs_bmap.h | 1 -
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index e0905ad171f0a5..d53afd82e109e5 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -1028,7 +1028,7 @@ xfs_bmap_add_attrfork_local(
>  }
>  
>  /* Set an inode attr fork off based on the format */
> -int
> +static int
>  xfs_bmap_set_attrforkoff(
>  	struct xfs_inode	*ip,
>  	int			size,
> diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h
> index 6747e97a794901..66a7b5b755a493 100644
> --- a/fs/xfs/libxfs/xfs_bmap.h
> +++ b/fs/xfs/libxfs/xfs_bmap.h
> @@ -186,7 +186,6 @@ static inline bool xfs_bmap_is_written_extent(struct xfs_bmbt_irec *irec)
>  void	xfs_trim_extent(struct xfs_bmbt_irec *irec, xfs_fileoff_t bno,
>  		xfs_filblks_t len);
>  int	xfs_bmap_add_attrfork(struct xfs_inode *ip, int size, int rsvd);
> -int	xfs_bmap_set_attrforkoff(struct xfs_inode *ip, int size, int *version);
>  void	xfs_bmap_local_to_extents_empty(struct xfs_trans *tp,
>  		struct xfs_inode *ip, int whichfork);
>  void	__xfs_bmap_add_free(struct xfs_trans *tp, xfs_fsblock_t bno,
> -- 
> 2.29.2
>