xfs: kill the STATIC_INLINE macro
Remove our own STATIC_INLINE macro. For small function inside implementation files just use STATIC and let gcc inline it, and for those in headers do the normal static inline - they are all small enough to be inlined for debug builds, too. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <david@fromorbit.com> Signed-off-by: Alex Elder <aelder@sgi.com>hifive-unleashed-5.1
Christoph Hellwig
Alex Elder
parent
5683f53e36
commit
b8f82a4a6f
|
|
@ -337,7 +337,7 @@ xfs_map_blocks(
|
|||
return -xfs_iomap(XFS_I(inode), offset, count, flags, mapp, &nmaps);
|
||||
}
|
||||
|
||||
STATIC_INLINE int
|
||||
STATIC int
|
||||
xfs_iomap_valid(
|
||||
xfs_iomap_t *iomapp,
|
||||
loff_t offset)
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ page_region_mask(
|
|||
return mask;
|
||||
}
|
||||
|
||||
STATIC_INLINE void
|
||||
STATIC void
|
||||
set_page_region(
|
||||
struct page *page,
|
||||
size_t offset,
|
||||
|
|
@ -161,7 +161,7 @@ set_page_region(
|
|||
SetPageUptodate(page);
|
||||
}
|
||||
|
||||
STATIC_INLINE int
|
||||
STATIC int
|
||||
test_page_region(
|
||||
struct page *page,
|
||||
size_t offset,
|
||||
|
|
@ -1113,7 +1113,7 @@ xfs_bdwrite(
|
|||
xfs_buf_delwri_queue(bp, 1);
|
||||
}
|
||||
|
||||
STATIC_INLINE void
|
||||
STATIC void
|
||||
_xfs_buf_ioend(
|
||||
xfs_buf_t *bp,
|
||||
int schedule)
|
||||
|
|
|
|||
|
|
@ -41,10 +41,6 @@ extern void assfail(char *expr, char *f, int l);
|
|||
# define STATIC static noinline
|
||||
#endif
|
||||
|
||||
#ifndef STATIC_INLINE
|
||||
# define STATIC_INLINE static inline
|
||||
#endif
|
||||
|
||||
#else /* DEBUG */
|
||||
|
||||
#define ASSERT(expr) \
|
||||
|
|
@ -54,19 +50,5 @@ extern void assfail(char *expr, char *f, int l);
|
|||
# define STATIC noinline
|
||||
#endif
|
||||
|
||||
/*
|
||||
* We stop inlining of inline functions in debug mode.
|
||||
* Unfortunately, this means static inline in header files
|
||||
* get multiple definitions, so they need to remain static.
|
||||
* This then gives tonnes of warnings about unused but defined
|
||||
* functions, so we need to add the unused attribute to prevent
|
||||
* these spurious warnings.
|
||||
*/
|
||||
#ifndef STATIC_INLINE
|
||||
# define STATIC_INLINE static __attribute__ ((unused)) noinline
|
||||
#endif
|
||||
|
||||
#endif /* DEBUG */
|
||||
|
||||
|
||||
#endif /* __XFS_SUPPORT_DEBUG_H__ */
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ STATIC int xfs_attr_leaf_entsize(xfs_attr_leafblock_t *leaf, int index);
|
|||
* If namespace bits don't match return 0.
|
||||
* If all match then return 1.
|
||||
*/
|
||||
STATIC_INLINE int
|
||||
STATIC int
|
||||
xfs_attr_namesp_match(int arg_flags, int ondisk_flags)
|
||||
{
|
||||
return XFS_ATTR_NSP_ONDISK(ondisk_flags) == XFS_ATTR_NSP_ARGS_TO_ONDISK(arg_flags);
|
||||
|
|
|
|||
|
|
@ -98,8 +98,7 @@ xfs_bmdr_to_bmbt(
|
|||
* This code must be in sync with the routines xfs_bmbt_get_startoff,
|
||||
* xfs_bmbt_get_startblock, xfs_bmbt_get_blockcount and xfs_bmbt_get_state.
|
||||
*/
|
||||
|
||||
STATIC_INLINE void
|
||||
STATIC void
|
||||
__xfs_bmbt_get_all(
|
||||
__uint64_t l0,
|
||||
__uint64_t l1,
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ extern ktrace_t *xfs_filestreams_trace_buf;
|
|||
* the cache that reference per-ag array elements that have since been
|
||||
* reallocated.
|
||||
*/
|
||||
STATIC_INLINE int
|
||||
static inline int
|
||||
xfs_filestream_peek_ag(
|
||||
xfs_mount_t *mp,
|
||||
xfs_agnumber_t agno)
|
||||
|
|
@ -87,7 +87,7 @@ xfs_filestream_peek_ag(
|
|||
return atomic_read(&mp->m_perag[agno].pagf_fstrms);
|
||||
}
|
||||
|
||||
STATIC_INLINE int
|
||||
static inline int
|
||||
xfs_filestream_get_ag(
|
||||
xfs_mount_t *mp,
|
||||
xfs_agnumber_t agno)
|
||||
|
|
@ -95,7 +95,7 @@ xfs_filestream_get_ag(
|
|||
return atomic_inc_return(&mp->m_perag[agno].pagf_fstrms);
|
||||
}
|
||||
|
||||
STATIC_INLINE int
|
||||
static inline int
|
||||
xfs_filestream_put_ag(
|
||||
xfs_mount_t *mp,
|
||||
xfs_agnumber_t agno)
|
||||
|
|
@ -122,7 +122,7 @@ int xfs_filestream_new_ag(struct xfs_bmalloca *ap, xfs_agnumber_t *agp);
|
|||
|
||||
|
||||
/* filestreams for the inode? */
|
||||
STATIC_INLINE int
|
||||
static inline int
|
||||
xfs_inode_is_filestream(
|
||||
struct xfs_inode *ip)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -425,7 +425,7 @@ xfs_ialloc_ag_alloc(
|
|||
return 0;
|
||||
}
|
||||
|
||||
STATIC_INLINE xfs_agnumber_t
|
||||
STATIC xfs_agnumber_t
|
||||
xfs_ialloc_next_ag(
|
||||
xfs_mount_t *mp)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2123,7 +2123,7 @@ xfs_icsb_destroy_counters(
|
|||
mutex_destroy(&mp->m_icsb_mutex);
|
||||
}
|
||||
|
||||
STATIC_INLINE void
|
||||
STATIC void
|
||||
xfs_icsb_lock_cntr(
|
||||
xfs_icsb_cnts_t *icsbp)
|
||||
{
|
||||
|
|
@ -2132,7 +2132,7 @@ xfs_icsb_lock_cntr(
|
|||
}
|
||||
}
|
||||
|
||||
STATIC_INLINE void
|
||||
STATIC void
|
||||
xfs_icsb_unlock_cntr(
|
||||
xfs_icsb_cnts_t *icsbp)
|
||||
{
|
||||
|
|
@ -2140,7 +2140,7 @@ xfs_icsb_unlock_cntr(
|
|||
}
|
||||
|
||||
|
||||
STATIC_INLINE void
|
||||
STATIC void
|
||||
xfs_icsb_lock_all_counters(
|
||||
xfs_mount_t *mp)
|
||||
{
|
||||
|
|
@ -2153,7 +2153,7 @@ xfs_icsb_lock_all_counters(
|
|||
}
|
||||
}
|
||||
|
||||
STATIC_INLINE void
|
||||
STATIC void
|
||||
xfs_icsb_unlock_all_counters(
|
||||
xfs_mount_t *mp)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -387,13 +387,13 @@ xfs_put_perag(struct xfs_mount *mp, xfs_perag_t *pag)
|
|||
* Per-cpu superblock locking functions
|
||||
*/
|
||||
#ifdef HAVE_PERCPU_SB
|
||||
STATIC_INLINE void
|
||||
static inline void
|
||||
xfs_icsb_lock(xfs_mount_t *mp)
|
||||
{
|
||||
mutex_lock(&mp->m_icsb_mutex);
|
||||
}
|
||||
|
||||
STATIC_INLINE void
|
||||
static inline void
|
||||
xfs_icsb_unlock(xfs_mount_t *mp)
|
||||
{
|
||||
mutex_unlock(&mp->m_icsb_mutex);
|
||||
|
|
|
|||
Loading…
Reference in New Issue