Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-12511 utils: fix regression for UAPI headers for native client
[fs/lustre-release.git]
/
lustre
/
utils
/
lstddef.h
diff --git
a/lustre/utils/lstddef.h
b/lustre/utils/lstddef.h
index
f1a6431
..
46e2901
100644
(file)
--- a/
lustre/utils/lstddef.h
+++ b/
lustre/utils/lstddef.h
@@
-1,7
+1,11
@@
#ifndef _LSTDDEF_H
#define _LSTDDEF_H
#ifndef _LSTDDEF_H
#define _LSTDDEF_H
-#include <stddef.h>
+#include <unistd.h>
+#include <linux/types.h>
+#include <sys/param.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
#define __ALIGN_LSTDDEF_MASK(x, mask) (((x) + (mask)) & ~(mask))
#define __ALIGN_LSTDDEF(x, a) __ALIGN_LSTDDEF_MASK(x, (typeof(x))(a) - 1)
#define __ALIGN_LSTDDEF_MASK(x, mask) (((x) + (mask)) & ~(mask))
#define __ALIGN_LSTDDEF(x, a) __ALIGN_LSTDDEF_MASK(x, (typeof(x))(a) - 1)
@@
-29,7
+33,6
@@
#define round_up(x, y) ((((x) - 1) | __round_mask(x, y)) + 1)
#define round_down(x, y) ((x) & ~__round_mask(x, y))
#define round_up(x, y) ((((x) - 1) | __round_mask(x, y)) + 1)
#define round_down(x, y) ((x) & ~__round_mask(x, y))
-#define FIELD_SIZEOF(t, f) (sizeof(((t *)0)->f))
#define DIV_ROUND_UP __USER_DIV_ROUND_UP
#define DIV_ROUND_DOWN_ULL(ll, d) \
#define DIV_ROUND_UP __USER_DIV_ROUND_UP
#define DIV_ROUND_DOWN_ULL(ll, d) \
@@
-43,12
+46,6
@@
# define DIV_ROUND_UP_SECTOR_T(ll, d) DIV_ROUND_UP(ll, d)
#endif
# define DIV_ROUND_UP_SECTOR_T(ll, d) DIV_ROUND_UP(ll, d)
#endif
-/* The `const' in roundup() prevents gcc-3.3 from calling __divdi3 */
-#define roundup(x, y) ({ \
- const typeof(y) __y = y; \
- (((x) + (__y - 1)) / __y) * __y; \
-})
-
#define rounddown(x, y) ({ \
typeof(x) __x = (x); \
__x - (__x % (y)); \
#define rounddown(x, y) ({ \
typeof(x) __x = (x); \
__x - (__x % (y)); \