Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not

-Werror clean.

3 files changed, 3 insertions, 27 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 262d5ea37..5610b7fe2 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -177,7 +177,7 @@ extern int * max_sectors[MAX_BLKDEV];
 
 extern int * max_segments[MAX_BLKDEV];
 
-#define MAX_SECTORS 128
+#define MAX_SECTORS 254
 
 #define MAX_SEGMENTS MAX_SECTORS
 
diff --git a/include/linux/umsdos_fs.p b/include/linux/umsdos_fs.p
index 677bee22e..93ad4d11d 100644
--- a/include/linux/umsdos_fs.p
+++ b/include/linux/umsdos_fs.p
@@ -17,26 +17,10 @@ struct dentry *umsdos_covered(struct dentry *, char *, int);
 struct dentry *umsdos_solve_hlink (struct dentry *hlink);
 
 /* emd.c 22/06/95 00.22.04 */
-ssize_t umsdos_file_write_kmem_real (struct file *filp,
-				const char *buf,
-				size_t  count);
-
-ssize_t umsdos_file_read_kmem (struct file *filp,
-	 char *buf,
-	 size_t count);
-ssize_t umsdos_file_write_kmem (struct file *filp,
-	 const char *buf,
-	 size_t count);
-ssize_t umsdos_emd_dir_write (struct file *filp,
-	 char *buf,
-	 size_t count);
-ssize_t umsdos_emd_dir_read (struct file *filp,
-	 char *buf,
-	 size_t count);
 struct dentry *umsdos_get_emd_dentry(struct dentry *);
 int umsdos_have_emd(struct dentry *);
 int umsdos_make_emd(struct dentry *);
-int umsdos_emd_dir_readentry (struct file *, struct umsdos_dirent *);
+int umsdos_emd_dir_readentry (struct dentry *, loff_t *, struct umsdos_dirent *);
 int umsdos_newentry (struct dentry *, struct umsdos_info *);
 int umsdos_newhidden (struct dentry *, struct umsdos_info *);
 int umsdos_delentry (struct dentry *, struct umsdos_info *, int);
diff --git a/include/linux/umsdos_fs_i.h b/include/linux/umsdos_fs_i.h
index e123efb10..0edfb1d54 100644
--- a/include/linux/umsdos_fs_i.h
+++ b/include/linux/umsdos_fs_i.h
@@ -21,13 +21,9 @@
  * So we duplicate the msdos_inode_info, and add our own info at the
  * end.
  * 
- * For all file type (and directory) the inode has a reference to:
- * the directory which hold this entry: i_dir_owner
- * The EMD file of i_dir_owner: i_emd_owner
  * The offset in this EMD file of the entry: pos
  * 
- * For directory, we also have a reference to the inode of its
- * own EMD file. Also, we have dir_locking_info to help synchronise
+ * For directory, we have dir_locking_info to help synchronise
  * file creation and file lookup. See also msdos_fs_i.h for more 
  * information about msdos_inode_info.
  * 
@@ -56,11 +52,7 @@ struct umsdos_inode_info {
 	struct dir_locking_info dir_info;
 	int i_patched;			/* Inode has been patched */
 	int i_is_hlink;			/* Resolved hardlink inode? */
-	unsigned long i_emd_owner;	/* Is this the EMD file inode? */
 	off_t pos;			/* Entry offset in the emd_owner file */
-	/* The rest is used only if this inode describes a directory */
-	struct dentry *i_emd_dentry;	/* EMD dentry for this directory */
-	unsigned long i_emd_dir;	/* Inode of the EMD file */
 };
 
 #endif