Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b8f82a4a6fc79fcb4b2eb81252020e04c9b49da5

Authored by Christoph Hellwig
Committed by Alex Elder
1 parent 5683f53e36
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 9 changed files with 17 additions and 36 deletions Side-by-side Diff

fs/xfs/linux-2.6/xfs_aops.c
Diff comments   View file @ b8f82a4
... ... @@ -337,7 +337,7 @@
337 337 return -xfs_iomap(XFS_I(inode), offset, count, flags, mapp, &nmaps);
338 338 }
339 339  
340   -STATIC_INLINE int
  340 +STATIC int
341 341 xfs_iomap_valid(
342 342 xfs_iomap_t *iomapp,
343 343 loff_t offset)
fs/xfs/linux-2.6/xfs_buf.c
Diff comments   View file @ b8f82a4
... ... @@ -149,7 +149,7 @@
149 149 return mask;
150 150 }
151 151  
152   -STATIC_INLINE void
  152 +STATIC void
153 153 set_page_region(
154 154 struct page *page,
155 155 size_t offset,
... ... @@ -161,7 +161,7 @@
161 161 SetPageUptodate(page);
162 162 }
163 163  
164   -STATIC_INLINE int
  164 +STATIC int
165 165 test_page_region(
166 166 struct page *page,
167 167 size_t offset,
... ... @@ -1113,7 +1113,7 @@
1113 1113 xfs_buf_delwri_queue(bp, 1);
1114 1114 }
1115 1115  
1116   -STATIC_INLINE void
  1116 +STATIC void
1117 1117 _xfs_buf_ioend(
1118 1118 xfs_buf_t *bp,
1119 1119 int schedule)
fs/xfs/support/debug.h
Diff comments   View file @ b8f82a4
... ... @@ -41,10 +41,6 @@
41 41 # define STATIC static noinline
42 42 #endif
43 43  
44   -#ifndef STATIC_INLINE
45   -# define STATIC_INLINE static inline
46   -#endif
47   -
48 44 #else /* DEBUG */
49 45  
50 46 #define ASSERT(expr) \
51 47  
... ... @@ -54,20 +50,6 @@
54 50 # define STATIC noinline
55 51 #endif
56 52  
57   -/*
58   - * We stop inlining of inline functions in debug mode.
59   - * Unfortunately, this means static inline in header files
60   - * get multiple definitions, so they need to remain static.
61   - * This then gives tonnes of warnings about unused but defined
62   - * functions, so we need to add the unused attribute to prevent
63   - * these spurious warnings.
64   - */
65   -#ifndef STATIC_INLINE
66   -# define STATIC_INLINE static __attribute__ ((unused)) noinline
67   -#endif
68   -
69 53 #endif /* DEBUG */
70   -
71   -
72 54 #endif /* __XFS_SUPPORT_DEBUG_H__ */
fs/xfs/xfs_attr_leaf.c
Diff comments   View file @ b8f82a4
... ... @@ -98,7 +98,7 @@
98 98 * If namespace bits don't match return 0.
99 99 * If all match then return 1.
100 100 */
101   -STATIC_INLINE int
  101 +STATIC int
102 102 xfs_attr_namesp_match(int arg_flags, int ondisk_flags)
103 103 {
104 104 return XFS_ATTR_NSP_ONDISK(ondisk_flags) == XFS_ATTR_NSP_ARGS_TO_ONDISK(arg_flags);
fs/xfs/xfs_bmap_btree.c
Diff comments   View file @ b8f82a4
... ... @@ -98,8 +98,7 @@
98 98 * This code must be in sync with the routines xfs_bmbt_get_startoff,
99 99 * xfs_bmbt_get_startblock, xfs_bmbt_get_blockcount and xfs_bmbt_get_state.
100 100 */
101   -
102   -STATIC_INLINE void
  101 +STATIC void
103 102 __xfs_bmbt_get_all(
104 103 __uint64_t l0,
105 104 __uint64_t l1,
fs/xfs/xfs_filestream.h
Diff comments   View file @ b8f82a4
... ... @@ -79,7 +79,7 @@
79 79 * the cache that reference per-ag array elements that have since been
80 80 * reallocated.
81 81 */
82   -STATIC_INLINE int
  82 +static inline int
83 83 xfs_filestream_peek_ag(
84 84 xfs_mount_t *mp,
85 85 xfs_agnumber_t agno)
... ... @@ -87,7 +87,7 @@
87 87 return atomic_read(&mp->m_perag[agno].pagf_fstrms);
88 88 }
89 89  
90   -STATIC_INLINE int
  90 +static inline int
91 91 xfs_filestream_get_ag(
92 92 xfs_mount_t *mp,
93 93 xfs_agnumber_t agno)
... ... @@ -95,7 +95,7 @@
95 95 return atomic_inc_return(&mp->m_perag[agno].pagf_fstrms);
96 96 }
97 97  
98   -STATIC_INLINE int
  98 +static inline int
99 99 xfs_filestream_put_ag(
100 100 xfs_mount_t *mp,
101 101 xfs_agnumber_t agno)
... ... @@ -122,7 +122,7 @@
122 122  
123 123  
124 124 /* filestreams for the inode? */
125   -STATIC_INLINE int
  125 +static inline int
126 126 xfs_inode_is_filestream(
127 127 struct xfs_inode *ip)
128 128 {
... ... @@ -425,7 +425,7 @@
425 425 return 0;
426 426 }
427 427  
428   -STATIC_INLINE xfs_agnumber_t
  428 +STATIC xfs_agnumber_t
429 429 xfs_ialloc_next_ag(
430 430 xfs_mount_t *mp)
431 431 {
... ... @@ -2123,7 +2123,7 @@
2123 2123 mutex_destroy(&mp->m_icsb_mutex);
2124 2124 }
2125 2125  
2126   -STATIC_INLINE void
  2126 +STATIC void
2127 2127 xfs_icsb_lock_cntr(
2128 2128 xfs_icsb_cnts_t *icsbp)
2129 2129 {
... ... @@ -2132,7 +2132,7 @@
2132 2132 }
2133 2133 }
2134 2134  
2135   -STATIC_INLINE void
  2135 +STATIC void
2136 2136 xfs_icsb_unlock_cntr(
2137 2137 xfs_icsb_cnts_t *icsbp)
2138 2138 {
... ... @@ -2140,7 +2140,7 @@
2140 2140 }
2141 2141  
2142 2142  
2143   -STATIC_INLINE void
  2143 +STATIC void
2144 2144 xfs_icsb_lock_all_counters(
2145 2145 xfs_mount_t *mp)
2146 2146 {
... ... @@ -2153,7 +2153,7 @@
2153 2153 }
2154 2154 }
2155 2155  
2156   -STATIC_INLINE void
  2156 +STATIC void
2157 2157 xfs_icsb_unlock_all_counters(
2158 2158 xfs_mount_t *mp)
2159 2159 {
... ... @@ -387,13 +387,13 @@
387 387 * Per-cpu superblock locking functions
388 388 */
389 389 #ifdef HAVE_PERCPU_SB
390   -STATIC_INLINE void
  390 +static inline void
391 391 xfs_icsb_lock(xfs_mount_t *mp)
392 392 {
393 393 mutex_lock(&mp->m_icsb_mutex);
394 394 }
395 395  
396   -STATIC_INLINE void
  396 +static inline void
397 397 xfs_icsb_unlock(xfs_mount_t *mp)
398 398 {
399 399 mutex_unlock(&mp->m_icsb_mutex);