bury __kernel_nlink_t, make internal nlink_t consistent

-3

arch/alpha/include/asm/posix_types.h

··· 10 10 typedef unsigned int __kernel_ino_t; 11 11 #define __kernel_ino_t __kernel_ino_t 12 12 13 - typedef unsigned int __kernel_nlink_t; 14 - #define __kernel_nlink_t __kernel_nlink_t 15 - 16 13 typedef unsigned long __kernel_sigset_t; /* at least 32 bits */ 17 14 18 15 #include <asm-generic/posix_types.h>

-3

arch/arm/include/asm/posix_types.h

··· 22 22 typedef unsigned short __kernel_mode_t; 23 23 #define __kernel_mode_t __kernel_mode_t 24 24 25 - typedef unsigned short __kernel_nlink_t; 26 - #define __kernel_nlink_t __kernel_nlink_t 27 - 28 25 typedef unsigned short __kernel_ipc_pid_t; 29 26 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 30 27

-3

arch/avr32/include/asm/posix_types.h

··· 17 17 typedef unsigned short __kernel_mode_t; 18 18 #define __kernel_mode_t __kernel_mode_t 19 19 20 - typedef unsigned short __kernel_nlink_t; 21 - #define __kernel_nlink_t __kernel_nlink_t 22 - 23 20 typedef unsigned short __kernel_ipc_pid_t; 24 21 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 25 22

-3

arch/blackfin/include/asm/posix_types.h

··· 10 10 typedef unsigned short __kernel_mode_t; 11 11 #define __kernel_mode_t __kernel_mode_t 12 12 13 - typedef unsigned short __kernel_nlink_t; 14 - #define __kernel_nlink_t __kernel_nlink_t 15 - 16 13 typedef unsigned int __kernel_ipc_pid_t; 17 14 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 18 15

-3

arch/cris/include/asm/posix_types.h

··· 15 15 typedef unsigned short __kernel_mode_t; 16 16 #define __kernel_mode_t __kernel_mode_t 17 17 18 - typedef unsigned short __kernel_nlink_t; 19 - #define __kernel_nlink_t __kernel_nlink_t 20 - 21 18 typedef unsigned short __kernel_ipc_pid_t; 22 19 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 23 20

-3

arch/frv/include/asm/posix_types.h

··· 10 10 typedef unsigned short __kernel_mode_t; 11 11 #define __kernel_mode_t __kernel_mode_t 12 12 13 - typedef unsigned short __kernel_nlink_t; 14 - #define __kernel_nlink_t __kernel_nlink_t 15 - 16 13 typedef unsigned short __kernel_ipc_pid_t; 17 14 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 18 15

-3

arch/h8300/include/asm/posix_types.h

··· 10 10 typedef unsigned short __kernel_mode_t; 11 11 #define __kernel_mode_t __kernel_mode_t 12 12 13 - typedef unsigned short __kernel_nlink_t; 14 - #define __kernel_nlink_t __kernel_nlink_t 15 - 16 13 typedef unsigned short __kernel_ipc_pid_t; 17 14 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 18 15

-3

arch/ia64/include/asm/posix_types.h

··· 1 1 #ifndef _ASM_IA64_POSIX_TYPES_H 2 2 #define _ASM_IA64_POSIX_TYPES_H 3 3 4 - typedef unsigned int __kernel_nlink_t; 5 - #define __kernel_nlink_t __kernel_nlink_t 6 - 7 4 typedef unsigned long __kernel_sigset_t; /* at least 32 bits */ 8 5 9 6 #include <asm-generic/posix_types.h>

-3

arch/m32r/include/asm/posix_types.h

··· 10 10 typedef unsigned short __kernel_mode_t; 11 11 #define __kernel_mode_t __kernel_mode_t 12 12 13 - typedef unsigned short __kernel_nlink_t; 14 - #define __kernel_nlink_t __kernel_nlink_t 15 - 16 13 typedef unsigned short __kernel_ipc_pid_t; 17 14 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 18 15

-3

arch/m68k/include/asm/posix_types.h

··· 10 10 typedef unsigned short __kernel_mode_t; 11 11 #define __kernel_mode_t __kernel_mode_t 12 12 13 - typedef unsigned short __kernel_nlink_t; 14 - #define __kernel_nlink_t __kernel_nlink_t 15 - 16 13 typedef unsigned short __kernel_ipc_pid_t; 17 14 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 18 15

-5

arch/mips/include/asm/posix_types.h

··· 17 17 * assume GCC is being used. 18 18 */ 19 19 20 - #if (_MIPS_SZLONG == 64) 21 - typedef unsigned int __kernel_nlink_t; 22 - #define __kernel_nlink_t __kernel_nlink_t 23 - #endif 24 - 25 20 typedef long __kernel_daddr_t; 26 21 #define __kernel_daddr_t __kernel_daddr_t 27 22

-3

arch/mn10300/include/asm/posix_types.h

··· 20 20 typedef unsigned short __kernel_mode_t; 21 21 #define __kernel_mode_t __kernel_mode_t 22 22 23 - typedef unsigned short __kernel_nlink_t; 24 - #define __kernel_nlink_t __kernel_nlink_t 25 - 26 23 typedef unsigned short __kernel_ipc_pid_t; 27 24 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 28 25

-3

arch/parisc/include/asm/posix_types.h

··· 10 10 typedef unsigned short __kernel_mode_t; 11 11 #define __kernel_mode_t __kernel_mode_t 12 12 13 - typedef unsigned short __kernel_nlink_t; 14 - #define __kernel_nlink_t __kernel_nlink_t 15 - 16 13 typedef unsigned short __kernel_ipc_pid_t; 17 14 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 18 15

-3

arch/powerpc/include/asm/posix_types.h

··· 16 16 typedef long __kernel_ptrdiff_t; 17 17 #define __kernel_size_t __kernel_size_t 18 18 19 - typedef unsigned short __kernel_nlink_t; 20 - #define __kernel_nlink_t __kernel_nlink_t 21 - 22 19 typedef short __kernel_ipc_pid_t; 23 20 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 24 21 #endif

-3

arch/s390/include/asm/posix_types.h

··· 24 24 25 25 typedef unsigned long __kernel_ino_t; 26 26 typedef unsigned short __kernel_mode_t; 27 - typedef unsigned short __kernel_nlink_t; 28 27 typedef unsigned short __kernel_ipc_pid_t; 29 28 typedef unsigned short __kernel_uid_t; 30 29 typedef unsigned short __kernel_gid_t; ··· 34 35 35 36 typedef unsigned int __kernel_ino_t; 36 37 typedef unsigned int __kernel_mode_t; 37 - typedef unsigned int __kernel_nlink_t; 38 38 typedef int __kernel_ipc_pid_t; 39 39 typedef unsigned int __kernel_uid_t; 40 40 typedef unsigned int __kernel_gid_t; ··· 45 47 46 48 #define __kernel_ino_t __kernel_ino_t 47 49 #define __kernel_mode_t __kernel_mode_t 48 - #define __kernel_nlink_t __kernel_nlink_t 49 50 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 50 51 #define __kernel_uid_t __kernel_uid_t 51 52 #define __kernel_gid_t __kernel_gid_t

-2

arch/sh/include/asm/posix_types_32.h

··· 3 3 4 4 typedef unsigned short __kernel_mode_t; 5 5 #define __kernel_mode_t __kernel_mode_t 6 - typedef unsigned short __kernel_nlink_t; 7 - #define __kernel_nlink_t __kernel_nlink_t 8 6 typedef unsigned short __kernel_ipc_pid_t; 9 7 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 10 8 typedef unsigned short __kernel_uid_t;

-2

arch/sh/include/asm/posix_types_64.h

··· 3 3 4 4 typedef unsigned short __kernel_mode_t; 5 5 #define __kernel_mode_t __kernel_mode_t 6 - typedef unsigned short __kernel_nlink_t; 7 - #define __kernel_nlink_t __kernel_nlink_t 8 6 typedef unsigned short __kernel_ipc_pid_t; 9 7 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 10 8 typedef unsigned short __kernel_uid_t;

-5

arch/sparc/include/asm/posix_types.h

··· 9 9 10 10 #if defined(__sparc__) && defined(__arch64__) 11 11 /* sparc 64 bit */ 12 - typedef unsigned int __kernel_nlink_t; 13 - #define __kernel_nlink_t __kernel_nlink_t 14 12 15 13 typedef unsigned short __kernel_old_uid_t; 16 14 typedef unsigned short __kernel_old_gid_t; ··· 35 37 36 38 typedef unsigned short __kernel_mode_t; 37 39 #define __kernel_mode_t __kernel_mode_t 38 - 39 - typedef short __kernel_nlink_t; 40 - #define __kernel_nlink_t __kernel_nlink_t 41 40 42 41 typedef long __kernel_daddr_t; 43 42 #define __kernel_daddr_t __kernel_daddr_t

-1

arch/tile/include/asm/compat.h

··· 44 44 typedef __kernel_mode_t compat_mode_t; 45 45 typedef __kernel_dev_t compat_dev_t; 46 46 typedef __kernel_loff_t compat_loff_t; 47 - typedef __kernel_nlink_t compat_nlink_t; 48 47 typedef __kernel_ipc_pid_t compat_ipc_pid_t; 49 48 typedef __kernel_daddr_t compat_daddr_t; 50 49 typedef __kernel_fsid_t compat_fsid_t;

-3

arch/x86/include/asm/posix_types_32.h

··· 10 10 typedef unsigned short __kernel_mode_t; 11 11 #define __kernel_mode_t __kernel_mode_t 12 12 13 - typedef unsigned short __kernel_nlink_t; 14 - #define __kernel_nlink_t __kernel_nlink_t 15 - 16 13 typedef unsigned short __kernel_ipc_pid_t; 17 14 #define __kernel_ipc_pid_t __kernel_ipc_pid_t 18 15

-4

include/asm-generic/posix_types.h

··· 23 23 typedef unsigned int __kernel_mode_t; 24 24 #endif 25 25 26 - #ifndef __kernel_nlink_t 27 - typedef __kernel_ulong_t __kernel_nlink_t; 28 - #endif 29 - 30 26 #ifndef __kernel_pid_t 31 27 typedef int __kernel_pid_t; 32 28 #endif

+1 -1

include/linux/types.h

··· 25 25 typedef __kernel_ino_t ino_t; 26 26 typedef __kernel_mode_t mode_t; 27 27 typedef unsigned short umode_t; 28 - typedef __kernel_nlink_t nlink_t; 28 + typedef __u32 nlink_t; 29 29 typedef __kernel_off_t off_t; 30 30 typedef __kernel_pid_t pid_t; 31 31 typedef __kernel_daddr_t daddr_t;