Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf6ae8b5 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

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: default avatarH. Peter Anvin <hpa@kernel.org>
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7557bc66

include/linux/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ unifdef-y += connector.h 
unifdef-y += cuda.h

unifdef-y += cyclades.h

unifdef-y += dccp.h

unifdef-y += dirent.h

unifdef-y += dlm.h

unifdef-y += dlm_plock.h

unifdef-y += edd.h

include/linux/dirent.h

+0 −20
Original line number Diff line number Diff line 
#ifndef _LINUX_DIRENT_H

#define _LINUX_DIRENT_H



struct dirent {

	long		d_ino;

	__kernel_off_t	d_off;

	unsigned short	d_reclen;

	char		d_name[256]; /* We must not include limits.h! */

};



struct dirent64 {

	__u64		d_ino;

	__s64		d_off;

	unsigned short	d_reclen;

	unsigned char	d_type;

	char		d_name[256];

};



#ifdef __KERNEL__



struct linux_dirent64 {

	u64		d_ino;

	s64		d_off;
@@ -26,7 +9,4 @@ struct linux_dirent64 { 
	char		d_name[0];

};



#endif	/* __KERNEL__ */





#endif