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

Commit 4f3d71f6 authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

xfs: move kernel specific type definitions to xfs.h 



xfs_types.h is shared with userspace, so having kernel specific
types defined in it is problematic. Move all the kernel specific
defines to xfs_linux.h so we can remove the __KERNEL__ guards from
xfs_types.h.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 9b90b0d9

fs/xfs/xfs_linux.h

+32 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,38 @@ 
# define XFS_BIG_INUMS	0

# define XFS_BIG_INUMS	0

#endif

#endif





/*

 * Kernel specific type declarations for XFS

 */

typedef signed char		__int8_t;

typedef unsigned char		__uint8_t;

typedef signed short int	__int16_t;

typedef unsigned short int	__uint16_t;

typedef signed int		__int32_t;

typedef unsigned int		__uint32_t;

typedef signed long long int	__int64_t;

typedef unsigned long long int	__uint64_t;



typedef __uint32_t		inst_t;		/* an instruction */



typedef __s64			xfs_off_t;	/* <file offset> type */

typedef unsigned long long	xfs_ino_t;	/* <inode> type */

typedef __s64			xfs_daddr_t;	/* <disk address> type */

typedef char *			xfs_caddr_t;	/* <core address> type */

typedef __u32			xfs_dev_t;

typedef __u32			xfs_nlink_t;



/* __psint_t is the same size as a pointer */

#if (BITS_PER_LONG == 32)

typedef __int32_t __psint_t;

typedef __uint32_t __psunsigned_t;

#elif (BITS_PER_LONG == 64)

typedef __int64_t __psint_t;

typedef __uint64_t __psunsigned_t;

#else

#error BITS_PER_LONG must be 32 or 64

#endif



#include "xfs_types.h"

#include "xfs_types.h"





#include "kmem.h"

#include "kmem.h"

fs/xfs/xfs_types.h

+0 −36
Original line number Original line Diff line number Diff line
@@ -18,42 +18,6 @@ 
#ifndef __XFS_TYPES_H__

#ifndef __XFS_TYPES_H__

#define	__XFS_TYPES_H__

#define	__XFS_TYPES_H__





#ifdef __KERNEL__



/*

 * Additional type declarations for XFS

 */

typedef signed char		__int8_t;

typedef unsigned char		__uint8_t;

typedef signed short int	__int16_t;

typedef unsigned short int	__uint16_t;

typedef signed int		__int32_t;

typedef unsigned int		__uint32_t;

typedef signed long long int	__int64_t;

typedef unsigned long long int	__uint64_t;



typedef __uint32_t		inst_t;		/* an instruction */



typedef __s64			xfs_off_t;	/* <file offset> type */

typedef unsigned long long	xfs_ino_t;	/* <inode> type */

typedef __s64			xfs_daddr_t;	/* <disk address> type */

typedef char *			xfs_caddr_t;	/* <core address> type */

typedef __u32			xfs_dev_t;

typedef __u32			xfs_nlink_t;



/* __psint_t is the same size as a pointer */

#if (BITS_PER_LONG == 32)

typedef __int32_t __psint_t;

typedef __uint32_t __psunsigned_t;

#elif (BITS_PER_LONG == 64)

typedef __int64_t __psint_t;

typedef __uint64_t __psunsigned_t;

#else

#error BITS_PER_LONG must be 32 or 64

#endif



#endif	/* __KERNEL__ */



typedef __uint32_t	prid_t;		/* project ID */

typedef __uint32_t	prid_t;		/* project ID */





typedef __uint32_t	xfs_agblock_t;	/* blockno in alloc. group */

typedef __uint32_t	xfs_agblock_t;	/* blockno in alloc. group */