Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cf6ae8b50e0ee3f764392dadd1970e3f03c40773

Authored by Adrian Bunk
Committed by Linus Torvalds
1 parent 7557bc66be
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

remove the in-kernel struct dirent{,64} 

The kernel struct dirent{,64} were different from the ones in
userspace.

Even worse, we exported the kernel ones to userspace.

But after the fat usages are fixed we can remove the conflicting
kernel versions.

Reviewed-by: H. Peter Anvin <hpa@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 0 additions and 21 deletions Side-by-side Diff

include/linux/Kbuild
Diff comments   View file @ cf6ae8b
... ... @@ -189,7 +189,6 @@
189 189 unifdef-y += cuda.h
190 190 unifdef-y += cyclades.h
191 191 unifdef-y += dccp.h
192   -unifdef-y += dirent.h
193 192 unifdef-y += dlm.h
194 193 unifdef-y += dlm_plock.h
195 194 unifdef-y += edd.h
include/linux/dirent.h
Diff comments   View file @ cf6ae8b
1 1 #ifndef _LINUX_DIRENT_H
2 2 #define _LINUX_DIRENT_H
3 3  
4   -struct dirent {
5   - long d_ino;
6   - __kernel_off_t d_off;
7   - unsigned short d_reclen;
8   - char d_name[256]; /* We must not include limits.h! */
9   -};
10   -
11   -struct dirent64 {
12   - __u64 d_ino;
13   - __s64 d_off;
14   - unsigned short d_reclen;
15   - unsigned char d_type;
16   - char d_name[256];
17   -};
18   -
19   -#ifdef __KERNEL__
20   -
21 4 struct linux_dirent64 {
22 5 u64 d_ino;
23 6 s64 d_off;
... ... @@ -25,9 +8,6 @@
25 8 unsigned char d_type;
26 9 char d_name[0];
27 10 };
28   -
29   -#endif /* __KERNEL__ */
30   -
31 11  
32 12 #endif