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

Commit 0225da1f authored by Harvey Harrison's avatar Harvey Harrison Committed by Lachlan McIlroy
Browse files

[XFS] Replace __inline with inline 



Remove the remaining uses of __inline in the XFS code base.

SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30774a

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 6b1d1a73

fs/xfs/linux-2.6/xfs_cred.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ typedef struct cred { 
extern struct cred *sys_cred;

extern struct cred *sys_cred;





/* this is a hack.. (assumes sys_cred is the only cred_t in the system) */

/* 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);

	return (cr == sys_cred) ? 1 : capable(cid);

}

}

fs/xfs/linux-2.6/xfs_stats.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -144,8 +144,8 @@ extern void xfs_cleanup_procfs(void); 
# define XFS_STATS_DEC(count)

# define XFS_STATS_DEC(count)

# define XFS_STATS_ADD(count, inc)

# define XFS_STATS_ADD(count, inc)





static __inline void xfs_init_procfs(void) { };

static inline void xfs_init_procfs(void) { };

static __inline void xfs_cleanup_procfs(void) { };

static inline void xfs_cleanup_procfs(void) { };





#endif	/* !CONFIG_PROC_FS */

#endif	/* !CONFIG_PROC_FS */

fs/xfs/quota/xfs_qm_stats.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -45,8 +45,8 @@ extern void xfs_qm_cleanup_procfs(void); 




# define XQM_STATS_INC(count)	do { } while (0)

# define XQM_STATS_INC(count)	do { } while (0)





static __inline void xfs_qm_init_procfs(void) { };

static inline void xfs_qm_init_procfs(void) { };

static __inline void xfs_qm_cleanup_procfs(void) { };

static inline void xfs_qm_cleanup_procfs(void) { };





#endif

#endif