diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-19 10:25:23 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-30 21:04:50 -0400 |
| commit | bb8ac181a5cf50458a0d83b4460790badc9fdc16 (patch) | |
| tree | d55493f9ca94516a0aa83dd8ee1d87c2a88d637b /include | |
| parent | 1dfb5751a4de7c6a57a5602e8e2b87267cfc8c81 (diff) | |
| download | linux-stable-bb8ac181a5cf50458a0d83b4460790badc9fdc16.tar.gz linux-stable-bb8ac181a5cf50458a0d83b4460790badc9fdc16.tar.bz2 linux-stable-bb8ac181a5cf50458a0d83b4460790badc9fdc16.zip | |
bury __kernel_nlink_t, make internal nlink_t consistent
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/posix_types.h | 4 | ||||
| -rw-r--r-- | include/linux/types.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-generic/posix_types.h b/include/asm-generic/posix_types.h index 91d44bd4dde3..fe74fccf18db 100644 --- a/include/asm-generic/posix_types.h +++ b/include/asm-generic/posix_types.h @@ -23,10 +23,6 @@ typedef __kernel_ulong_t __kernel_ino_t; typedef unsigned int __kernel_mode_t; #endif -#ifndef __kernel_nlink_t -typedef __kernel_ulong_t __kernel_nlink_t; -#endif - #ifndef __kernel_pid_t typedef int __kernel_pid_t; #endif diff --git a/include/linux/types.h b/include/linux/types.h index 7f480db60231..9c1bd539ea70 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -25,7 +25,7 @@ typedef __kernel_dev_t dev_t; typedef __kernel_ino_t ino_t; typedef __kernel_mode_t mode_t; typedef unsigned short umode_t; -typedef __kernel_nlink_t nlink_t; +typedef __u32 nlink_t; typedef __kernel_off_t off_t; typedef __kernel_pid_t pid_t; typedef __kernel_daddr_t daddr_t; |