mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@kernel.org>
To: "H. Peter Anvin" <hpa@kernel.org>
Cc: "OGAWA Hirofumi" <hirofumi@mail.parknet.co.jp>,
	"S.Çağlar Onur" <caglar@pardus.org.tr>,
	linux-kernel@vger.kernel.org,
	"Linus Torvalds" <torvalds@linux-foundation.org>,
	"Frank Seidel" <fseidel@suse.de>,
	"Onur Küçük" <onur@pardus.org.tr>,
	"Andrew Morton" <akpm@linux-foundation.org>
Subject: [2.6 patch] remove the in-kernel struct dirent{,64}
Date: Tue, 10 Jun 2008 01:27:01 +0300	[thread overview]
Message-ID: <20080609222701.GZ1987@cs181133002.pp.htv.fi> (raw)
In-Reply-To: <484C83D9.2020402@kernel.org>

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.

Reported-by: H. Peter Anvin <hpa@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

This patch has to be applied after the two patches that change fat to 
use __fat_fs_dirent.

 include/linux/Kbuild   |    1 -
 include/linux/dirent.h |   20 --------------------
 2 files changed, 21 deletions(-)

d447529e60e097e260ed43ca97b04dde36954c8b diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 93b9885..4d3649a 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -186,7 +186,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
diff --git a/include/linux/dirent.h b/include/linux/dirent.h
index 5d6023b..f072fb8 100644
--- a/include/linux/dirent.h
+++ b/include/linux/dirent.h
@@ -1,23 +1,6 @@
 #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


      parent reply	other threads:[~2008-06-09 22:30 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-08 18:16 [PATCH] include/linux/msdos_fs.h: Cleanup include/linux/msdos_fs.h for userspace S.Çağlar Onur
2008-06-08 18:36 ` OGAWA Hirofumi
2008-06-08 18:43 ` [2.6.26 patch] fat_valid_media() isn't " Adrian Bunk
2008-06-08 18:55   ` OGAWA Hirofumi
2008-06-09  1:14     ` H. Peter Anvin
2008-06-09  4:12       ` OGAWA Hirofumi
2008-06-09  4:41         ` H. Peter Anvin
2008-06-09  8:05         ` Adrian Bunk
2008-06-09 22:26         ` [2.6 patch] fat/dir.c: switch to struct __fat_fs_dirent Adrian Bunk
2008-06-09 23:12           ` OGAWA Hirofumi
2008-06-09 22:27       ` Adrian Bunk [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080609222701.GZ1987@cs181133002.pp.htv.fi \
    --to=bunk@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=caglar@pardus.org.tr \
    --cc=fseidel@suse.de \
    --cc=hirofumi@mail.parknet.co.jp \
    --cc=hpa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=onur@pardus.org.tr \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®