Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
b630c17896
|
@ -39,27 +39,34 @@
|
||||||
|
|
||||||
typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
|
typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
|
||||||
|
|
||||||
typedef unsigned char uchar_t;
|
typedef unsigned char uchar_t;
|
||||||
typedef unsigned short ushort_t;
|
typedef unsigned short ushort_t;
|
||||||
typedef unsigned int uint_t;
|
typedef unsigned int uint_t;
|
||||||
typedef unsigned long ulong_t;
|
typedef unsigned long ulong_t;
|
||||||
|
|
||||||
typedef long long longlong_t;
|
typedef long long longlong_t;
|
||||||
typedef unsigned long long u_longlong_t;
|
typedef unsigned long long u_longlong_t;
|
||||||
#endif /* HAVE_INTTYPES */
|
#endif /* HAVE_INTTYPES */
|
||||||
|
|
||||||
typedef longlong_t offset_t;
|
typedef longlong_t offset_t;
|
||||||
typedef u_longlong_t u_offset_t;
|
typedef u_longlong_t u_offset_t;
|
||||||
typedef u_longlong_t len_t;
|
typedef u_longlong_t len_t;
|
||||||
typedef longlong_t diskaddr_t;
|
typedef longlong_t diskaddr_t;
|
||||||
|
|
||||||
typedef short pri_t;
|
typedef ulong_t pfn_t; /* page frame number */
|
||||||
|
typedef ulong_t pgcnt_t; /* number of pages */
|
||||||
|
typedef long spgcnt_t; /* signed number of pages */
|
||||||
|
|
||||||
typedef int zoneid_t;
|
typedef longlong_t hrtime_t;
|
||||||
typedef int projid_t;
|
typedef struct timespec timestruc_t;
|
||||||
|
|
||||||
typedef int major_t;
|
typedef short pri_t;
|
||||||
typedef int minor_t;
|
|
||||||
|
typedef int zoneid_t;
|
||||||
|
typedef int projid_t;
|
||||||
|
|
||||||
|
typedef int major_t;
|
||||||
|
typedef int minor_t;
|
||||||
|
|
||||||
typedef ushort_t o_mode_t; /* old file attribute type */
|
typedef ushort_t o_mode_t; /* old file attribute type */
|
||||||
|
|
||||||
|
@ -88,7 +95,4 @@ typedef union {
|
||||||
} lloff_t;
|
} lloff_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef longlong_t hrtime_t;
|
|
||||||
typedef struct timespec timestruc_t;
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue