Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc41e2a1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: always define STATIC to static noinline 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 866d7826

fs/xfs/xfs.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#define __XFS_H__



#ifdef CONFIG_XFS_DEBUG

#define STATIC

#define DEBUG 1

#define XFS_BUF_LOCK_TRACKING 1

#endif

fs/xfs/xfs_linux.h

+2 −12
Original line number Diff line number Diff line
@@ -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



/*