1 --- xfsprogs-3.0.0/include/linux.h~ 2009-02-04 23:29:25.000000000 +0100
2 +++ xfsprogs-3.0.0/include/linux.h 2009-03-19 16:19:35.000000000 +0100
9 +#include <xfs/xfs_types.h>
12 static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
14 diff -ur xfsprogs-3.0.0/include/project.h xfsprogs-3.0.0-diet/include/project.h
15 --- xfsprogs-3.0.0/include/project.h 2009-02-04 23:29:25.000000000 +0100
16 +++ xfsprogs-3.0.0-diet/include/project.h 2009-03-19 12:55:05.000000000 +0100
22 +#include <xfs/xfs_types.h>
26 typedef __uint32_t prid_t;
27 diff -ur xfsprogs-3.0.0/include/xfs_ialloc_btree.h xfsprogs-3.0.0-diet/include/xfs_ialloc_btree.h
28 --- xfsprogs-3.0.0/include/xfs_ialloc_btree.h 2009-02-04 23:29:25.000000000 +0100
29 +++ xfsprogs-3.0.0-diet/include/xfs_ialloc_btree.h 2009-03-19 12:49:55.000000000 +0100
31 #ifndef __XFS_IALLOC_BTREE_H__
32 #define __XFS_IALLOC_BTREE_H__
35 +#define NBBY CHAR_BIT
38 * Inode map on-disk structures
40 diff -ur xfsprogs-3.0.0/include/xfs_types.h xfsprogs-3.0.0-diet/include/xfs_types.h
41 --- xfsprogs-3.0.0/include/xfs_types.h 2009-02-04 23:29:25.000000000 +0100
42 +++ xfsprogs-3.0.0-diet/include/xfs_types.h 2009-03-19 12:40:08.000000000 +0100
44 typedef unsigned int uint_t;
45 typedef unsigned long ulong_t;
48 - * Additional type declarations for XFS
50 -typedef signed char __int8_t;
51 -typedef unsigned char __uint8_t;
52 -typedef signed short int __int16_t;
53 -typedef unsigned short int __uint16_t;
54 -typedef signed int __int32_t;
55 -typedef unsigned int __uint32_t;
56 -typedef signed long long int __int64_t;
57 -typedef unsigned long long int __uint64_t;
59 typedef enum { B_FALSE,B_TRUE } boolean_t;
60 typedef __uint32_t prid_t; /* project ID */
61 typedef __uint32_t inst_t; /* an instruction */
64 #endif /* __KERNEL__ */
66 +#if defined(__dietlibc__) || defined(__KERNEL__)
68 + * Additional type declarations for XFS
70 +typedef signed char __int8_t;
71 +typedef unsigned char __uint8_t;
72 +typedef signed short int __int16_t;
73 +typedef unsigned short int __uint16_t;
74 +typedef signed int __int32_t;
75 +typedef unsigned int __uint32_t;
76 +typedef signed long long int __int64_t;
77 +typedef unsigned long long int __uint64_t;
80 typedef __uint32_t xfs_agblock_t; /* blockno in alloc. group */
81 typedef __uint32_t xfs_extlen_t; /* extent length in blocks */
82 typedef __uint32_t xfs_agnumber_t; /* allocation group number */
83 --- xfsprogs-3.0.0/libdisk/evms.h~ 2009-02-04 23:29:25.000000000 +0100
84 +++ xfsprogs-3.0.0/libdisk/evms.h 2009-03-19 21:52:18.000000000 +0100
86 * along with this program; if not, write to the Free Software
87 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
90 +#include <xfs/platform_defs.h>
93 #define EVMS_MAJOR 117
94 #define EVMS_GET_VOL_STRIPE_INFO \
95 diff -ur xfsprogs-3.0.0/libdisk/xvm.h xfsprogs-3.0.0-diet/libdisk/xvm.h
96 --- xfsprogs-3.0.0/libdisk/xvm.h 2009-02-04 23:29:25.000000000 +0100
97 +++ xfsprogs-3.0.0-diet/libdisk/xvm.h 2009-03-19 12:56:54.000000000 +0100
99 * along with this program; if not, write the Free Software Foundation,
100 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
103 +#include <xfs/platform_defs.h>
104 +#include <xfs/xfs_types.h>
107 #define _DIOC_(x) (('d'<<8) | x)
108 #define DIOCGETVOLDEV _DIOC_(36) /* subvolume devices */
109 diff -ur xfsprogs-3.0.0/libhandle/handle.c xfsprogs-3.0.0-diet/libhandle/handle.c
110 --- xfsprogs-3.0.0/libhandle/handle.c 2009-02-04 23:29:25.000000000 +0100
111 +++ xfsprogs-3.0.0-diet/libhandle/handle.c 2009-03-19 12:56:03.000000000 +0100
114 #include <xfs/handle.h>
115 #include <xfs/parent.h>
117 +#include <xfs/xfs_types.h>
118 +#include <linux/limits.h>
121 /* just pick a value we know is more than big enough */
123 diff -ur xfsprogs-3.0.0/libhandle/jdm.c xfsprogs-3.0.0-diet/libhandle/jdm.c
124 --- xfsprogs-3.0.0/libhandle/jdm.c 2009-02-04 23:29:25.000000000 +0100
125 +++ xfsprogs-3.0.0-diet/libhandle/jdm.c 2009-03-19 12:56:28.000000000 +0100
127 #include <xfs/handle.h>
129 #include <xfs/parent.h>
131 +#include <xfs/xfs_types.h>
132 +#include <linux/limits.h>
135 /* internal fshandle - typecast to a void for external use */
136 #define FSHANDLE_SZ 8
137 diff -ur xfsprogs-3.0.0/libxfs/linux.c xfsprogs-3.0.0-diet/libxfs/linux.c
138 --- xfsprogs-3.0.0/libxfs/linux.c 2009-02-04 23:29:25.000000000 +0100
139 +++ xfsprogs-3.0.0-diet/libxfs/linux.c 2009-03-19 13:30:12.000000000 +0100
142 #include <sys/stat.h>
146 +#include <sys/types.h>
148 #include <sys/ustat.h>
150 #include <sys/mount.h>
151 #include <sys/ioctl.h>
152 #include <sys/sysinfo.h>
153 diff -ur xfsprogs-3.0.0/repair/prefetch.c xfsprogs-3.0.0-diet/repair/prefetch.c
154 --- xfsprogs-3.0.0/repair/prefetch.c 2009-02-04 23:29:26.000000000 +0100
155 +++ xfsprogs-3.0.0-diet/repair/prefetch.c 2009-03-19 16:00:01.000000000 +0100
159 mp_fd = libxfs_device_to_fd(mp->m_dev);
161 + pf_max_bytes = sysconf(_SC_PAGESIZE) << 7;
163 pf_max_bytes = sysconf(_SC_PAGE_SIZE) << 7;
165 pf_max_bbs = pf_max_bytes >> BBSHIFT;
166 pf_max_fsbs = pf_max_bytes >> mp->m_sb.sb_blocklog;
167 pf_batch_bytes = DEF_BATCH_BYTES;
168 --- xfsprogs-3.0.0/include/platform_defs.h.in~ 2009-02-04 23:29:25.000000000 +0100
169 +++ xfsprogs-3.0.0/include/platform_defs.h.in 2009-03-19 21:48:13.000000000 +0100
174 +#if defined(__dietlibc__) && defined(__NO_STAT64)
175 +#define lstat64 lstat
176 +#define fstat64 fstat
178 +#define pread64 pread
179 +#define pwrite64 pwrite
180 +#define lseek64 lseek
181 +#define ftruncate64 ftruncate
184 #endif /* __XFS_PLATFORM_DEFS_H__ */