From: Harvey Harrison <harvey.harrison@gmail.com>

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: David Chinner <dgc@sgi.com>
Cc: Timothy Shimmin <tes@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 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(-)

diff -puN fs/xfs/linux-2.6/xfs_cred.h~xfs-replace-__inline-with-inline fs/xfs/linux-2.6/xfs_cred.h
--- a/fs/xfs/linux-2.6/xfs_cred.h~xfs-replace-__inline-with-inline
+++ a/fs/xfs/linux-2.6/xfs_cred.h
@@ -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);
 }
diff -puN fs/xfs/linux-2.6/xfs_stats.h~xfs-replace-__inline-with-inline fs/xfs/linux-2.6/xfs_stats.h
--- a/fs/xfs/linux-2.6/xfs_stats.h~xfs-replace-__inline-with-inline
+++ a/fs/xfs/linux-2.6/xfs_stats.h
@@ -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 */
 
diff -puN fs/xfs/quota/xfs_qm_stats.h~xfs-replace-__inline-with-inline fs/xfs/quota/xfs_qm_stats.h
--- a/fs/xfs/quota/xfs_qm_stats.h~xfs-replace-__inline-with-inline
+++ a/fs/xfs/quota/xfs_qm_stats.h
@@ -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
 
_