Re: [PATCH 1/8] xfs: always define STATIC to static noinline

["Darrick J. Wong" <darrick.wong@oracle.com>]

On Mon, Nov 06, 2017 at 03:34:49PM +0100, Christoph Hellwig wrote:
> Ever since we added the noinline tag there is no good reason to define
> away the static for debug builds - we'll get just as good debug
> information with our without it, so don't mess up sparse and other
> checkers due to it.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

> ---
>  fs/xfs/xfs.h       |  1 -
>  fs/xfs/xfs_linux.h | 14 ++------------
>  2 files changed, 2 insertions(+), 13 deletions(-)
> 
> diff --git a/fs/xfs/xfs.h b/fs/xfs/xfs.h
> index 80cd0fd86783..5ff7f228d616 100644
> --- a/fs/xfs/xfs.h
> +++ b/fs/xfs/xfs.h
> @@ -19,7 +19,6 @@
>  #define __XFS_H__
>  
>  #ifdef CONFIG_XFS_DEBUG
> -#define STATIC
>  #define DEBUG 1
>  #define XFS_BUF_LOCK_TRACKING 1
>  #endif
> diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
> index 00a5efeec496..6282bfc1afa9 100644
> --- a/fs/xfs/xfs_linux.h
> +++ b/fs/xfs/xfs_linux.h
> @@ -250,10 +250,6 @@ static inline uint64_t howmany_64(uint64_t x, uint32_t y)
>  #define ASSERT(expr)	\
>  	(likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
>  
> -#ifndef STATIC
> -# define STATIC noinline
> -#endif
> -
>  #else	/* !DEBUG */
>  
>  #ifdef XFS_WARN
> @@ -261,21 +257,15 @@ static inline uint64_t howmany_64(uint64_t x, uint32_t y)
>  #define ASSERT(expr)	\
>  	(likely(expr) ? (void)0 : asswarn(#expr, __FILE__, __LINE__))
>  
> -#ifndef STATIC
> -# define STATIC static noinline
> -#endif
> -
>  #else	/* !DEBUG && !XFS_WARN */
>  
>  #define ASSERT(expr)	((void)0)
>  
> -#ifndef STATIC
> -# define STATIC static noinline
> -#endif
> -
>  #endif /* XFS_WARN */
>  #endif /* DEBUG */
>  
> +#define STATIC static noinline
> +
>  #ifdef CONFIG_XFS_RT
>  
>  /*
> -- 
> 2.14.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html