Skip to contentSkip to conversation

xfs: replace __inline with inline

PATCH In review Harvey Harrison 2 participants 2 messages Mar 5, 2008 – Mar 6, 2008 XFS filesystem

lore
Share & tools
lore

Harvey Harrison

author
#0 lore raw

PATCH 6/9 xfs: replace __inline with inline

Signed-off-by Harvey Harrison <[email protected]>
---
 fs/xfs/linux-2.6/xfs_cred.h  |    2 +-
 fs/xfs/linux-2.6/xfs_stats.h |    4 ++--
 fs/xfs/quota/xfs_qm_stats.h  |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
fs/xfs/linux-2.6/xfs_cred.h +1 -1
index e7f3da6..652721c 100644
@@ -30,7 +30,7 @@ typedef struct cred {
 extern struct cred *sys_cred;
 
 /* this is a hack.. (assumes sys_cred is the only cred_t in the system) */
-static __inline int capable_cred(cred_t *cr, int cid)
+static inline int capable_cred(cred_t *cr, int cid)
 {
 	return (cr == sys_cred) ? 1 : capable(cid);
 }
fs/xfs/linux-2.6/xfs_stats.h +2 -2
index 8ba7a2f..afd0b0d 100644
@@ -144,8 +144,8 @@ extern void xfs_cleanup_procfs(void);
 # define XFS_STATS_DEC(count)
 # define XFS_STATS_ADD(count, inc)
 
-static __inline void xfs_init_procfs(void) { };
-static __inline void xfs_cleanup_procfs(void) { };
+static inline void xfs_init_procfs(void) { };
+static inline void xfs_cleanup_procfs(void) { };
 
 #endif	/* !CONFIG_PROC_FS */
fs/xfs/quota/xfs_qm_stats.h +2 -2
index a50ffab..5b964fc 100644
@@ -45,8 +45,8 @@ extern void xfs_qm_cleanup_procfs(void);
 
 # define XQM_STATS_INC(count)	do { } while (0)
 
-static __inline void xfs_qm_init_procfs(void) { };
-static __inline void xfs_qm_cleanup_procfs(void) { };
+static inline void xfs_qm_init_procfs(void) { };
+static inline void xfs_qm_cleanup_procfs(void) { };
 
 #endif
Signature · 1 line
1.5.4.3.500.g83a2c
#1 lore raw
Quoted 6 lines · Harvey Harrison
Signed-off-by Harvey Harrison <[email protected]>
---
 fs/xfs/linux-2.6/xfs_cred.h  |    2 +-
 fs/xfs/linux-2.6/xfs_stats.h |    4 ++--
 fs/xfs/quota/xfs_qm_stats.h  |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

This looks good to me, especially given that plain 'inline' is the canonical form in xfs these days.