[PATCH] remove umsdos from tree

UMSDOS has been non-function since early 2.5 and would need a major rewrite
to be resurrected (which I don't hope anyone plans as it's a really
horrible hack)

From: Adrian Bunk <bunk@stusta.de>

With umsdos gone, there's no longer a MAINTAINERS entry required.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 0 insertions, 340 deletions

diff --git a/include/linux/umsdos_fs.h b/include/linux/umsdos_fs.h
deleted file mode 100644
index 67c25693db66ac..00000000000000
--- a/include/linux/umsdos_fs.h
+++ /dev/null
@@ -1,182 +0,0 @@
-#ifndef LINUX_UMSDOS_FS_H
-#define LINUX_UMSDOS_FS_H
-
-
-/*#define UMS_DEBUG 1	// define for check_* functions */
-/*#define UMSDOS_DEBUG 1*/
-#define UMSDOS_PARANOIA 1
-
-#define UMSDOS_VERSION	0
-#define UMSDOS_RELEASE	4
-
-#define UMSDOS_ROOT_INO 1
-
-/* This is the file acting as a directory extension */
-#define UMSDOS_EMD_FILE		"--linux-.---"
-#define UMSDOS_EMD_NAMELEN	12
-#define UMSDOS_PSDROOT_NAME	"linux"
-#define UMSDOS_PSDROOT_LEN	5
-
-#ifndef _LINUX_TYPES_H
-#include <linux/types.h>
-#endif
-#ifndef _LINUX_LIMITS_H
-#include <linux/limits.h>
-#endif
-#ifndef _LINUX_DIRENT_H
-#include <linux/dirent.h>
-#endif
-#ifndef _LINUX_IOCTL_H
-#include <linux/ioctl.h>
-#endif
-
-
-#ifdef __KERNEL__
-/* #Specification: convention / PRINTK Printk and printk
- * Here is the convention for the use of printk inside fs/umsdos
- * 
- * printk carry important message (error or status).
- * Printk is for debugging (it is a macro defined at the beginning of
- * most source.
- * PRINTK is a nulled Printk macro.
- * 
- * This convention makes the source easier to read, and Printk easier
- * to shut off.
- */
-#	define PRINTK(x)
-#	ifdef UMSDOS_DEBUG
-#		define Printk(x) printk x
-#	else
-#		define Printk(x)
-#	endif
-#endif	/* __KERNEL__ */
-
-
-struct umsdos_fake_info {
-	char fname[13];
-	int len;
-};
-
-#define UMSDOS_MAXNAME	220
-/* This structure is 256 bytes large, depending on the name, only part */
-/* of it is written to disk */
-/* nice though it would be, I can't change this and preserve backward compatibility */
-struct umsdos_dirent {
-	unsigned char name_len;	/* if == 0, then this entry is not used */
-	unsigned char flags;	/* UMSDOS_xxxx */
-	unsigned short nlink;	/* How many hard links point to this entry */
-	__kernel_uid_t uid;	/* Owner user id */
-	__kernel_gid_t gid;	/* Group id */
-	time_t atime;		/* Access time */
-	time_t mtime;		/* Last modification time */
-	time_t ctime;		/* Creation time */
-	unsigned short rdev;	/* major and minor of a device special file */
-	umode_t mode;		/* Standard UNIX permissions bits + type of */
-	char spare[12];		/* unused bytes for future extensions */
-				/* file, see linux/stat.h */
-	char name[UMSDOS_MAXNAME];	/* Not '\0' terminated */
-				/* but '\0' padded, so it will allow */
-				/* for adding news fields in this record */
-				/* by reducing the size of name[] */
-};
-
-#define UMSDOS_HIDDEN	1	/* Never show this entry in directory search */
-#define UMSDOS_HLINK	2	/* It is a (pseudo) hard link */
-
-/* #Specification: EMD file / record size
- * Entry are 64 bytes wide in the EMD file. It allows for a 30 characters
- * name. If a name is longer, contiguous entries are allocated. So a
- * umsdos_dirent may span multiple records.
- */
- 
-#define UMSDOS_REC_SIZE		64
-
-/* Translation between MSDOS name and UMSDOS name */
-
-struct umsdos_info {
-	int msdos_reject;	/* Tell if the file name is invalid for MSDOS */
-				/* See umsdos_parse */
-	struct umsdos_fake_info fake;
-	struct umsdos_dirent entry;
-	off_t f_pos;		/* offset of the entry in the EMD file
-				 * or offset where the entry may be store
-				 * if it is a new entry
-				 */
-	int recsize;		/* Record size needed to store entry */
-};
-
-/* Definitions for ioctl (number randomly chosen)
- * The next ioctl commands operate only on the DOS directory
- * The file umsdos_progs/umsdosio.c contain a string table
- * based on the order of those definition. Keep it in sync
- */
-#define UMSDOS_READDIR_DOS _IO(0x04,210)	/* Do a readdir of the DOS directory */
-#define UMSDOS_UNLINK_DOS  _IO(0x04,211)	/* Erase in the DOS directory only */
-#define UMSDOS_RMDIR_DOS   _IO(0x04,212)	/* rmdir in the DOS directory only */
-#define UMSDOS_STAT_DOS    _IO(0x04,213)	/* Get info about a file */
-
-/* The next ioctl commands operate only on the EMD file */
-#define UMSDOS_CREAT_EMD   _IO(0x04,214)	/* Create a file */
-#define UMSDOS_UNLINK_EMD  _IO(0x04,215)	/* unlink (rmdir) a file */
-#define UMSDOS_READDIR_EMD _IO(0x04,216)	/* read the EMD file only. */
-#define UMSDOS_GETVERSION  _IO(0x04,217)	/* Get the release number of UMSDOS */
-#define UMSDOS_INIT_EMD    _IO(0x04,218)	/* Create the EMD file if not there */
-#define UMSDOS_DOS_SETUP   _IO(0x04,219)	/* Set the defaults of the MS-DOS driver. */
-
-#define UMSDOS_RENAME_DOS  _IO(0x04,220)	/* rename a file/directory in the DOS
-						 * directory only */
-struct umsdos_ioctl {
-	struct dirent dos_dirent;
-	struct umsdos_dirent umsdos_dirent;
-	/* The following structure is used to exchange some data with
-	 * utilities (umsdos_progs/util/umsdosio.c). The first releases
-	 * were using struct stat from "sys/stat.h". This was causing
-	 * some problem for cross compilation of the kernel.
-	 * Since I am not really using the structure stat, but only
-	 * some fields of it, I have decided to replicate the structure
-	 * here for compatibility with the binaries out there.
-	 * FIXME PTW 1998, this has probably changed
-	 */
-	
-	struct {
-		unsigned long st_dev;
-		ino_t st_ino;			/* used */
-		umode_t st_mode;		/* used */
-		nlink_t st_nlink;
-		__kernel_uid_t st_uid;
-		__kernel_gid_t st_gid;
-		unsigned long st_rdev;
-		off_t st_size;			/* used */
-		unsigned long st_blksize;
-		unsigned long st_blocks;
-		time_t st_atime;		/* used */
-		unsigned long __unused1;
-		time_t st_mtime;		/* used */
-		unsigned long __unused2;
-		time_t st_ctime;		/* used */
-		unsigned long __unused3;
-		uid_t st_uid32;
-		gid_t st_gid32;
-	} stat;
-	char version, release;
-};
-
-/* Different macros to access struct umsdos_dirent */
-#define EDM_ENTRY_ISUSED(e) ((e)->name_len!=0)
-
-#ifdef __KERNEL__
-
-#ifndef LINUX_FS_H
-#include <linux/fs.h>
-#endif
-
-extern struct inode_operations umsdos_dir_inode_operations;
-extern struct inode_operations umsdos_rdir_inode_operations;
-extern struct file_operations umsdos_dir_operations;
-extern struct file_operations umsdos_rdir_operations;
-
-#include <linux/umsdos_fs.p>
-
-#endif				/* __KERNEL__ */
-
-#endif
diff --git a/include/linux/umsdos_fs.p b/include/linux/umsdos_fs.p
deleted file mode 100644
index 1c284c5a7aecef..00000000000000
--- a/include/linux/umsdos_fs.p
+++ /dev/null
@@ -1,100 +0,0 @@
-/* check.c 23/01/95 03.38.30 */
-void check_page_tables (void);
-
-/* dir.c 22/06/95 00.22.12 */
-int  dummy_dir_read ( struct file *filp,
-	 char *buf,
-	 size_t size,
-	 loff_t *count);
-char * umsdos_d_path(struct dentry *, char *, int);
-void umsdos_lookup_patch_new(struct dentry *, struct umsdos_info *);
-int umsdos_is_pseudodos (struct inode *dir, struct dentry *dentry);
-struct dentry *umsdos_lookup_x ( struct inode *dir, struct dentry *dentry, int nopseudo);
-struct dentry *UMSDOS_lookup(struct inode *, struct dentry *, struct nameidata *);
-struct dentry *umsdos_lookup_dentry(struct dentry *, char *, int, int);
-struct dentry *umsdos_covered(struct dentry *, char *, int);
-
-struct dentry *umsdos_solve_hlink (struct dentry *hlink);
-
-/* emd.c 22/06/95 00.22.04 */
-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 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);
-int umsdos_findentry (struct dentry *, struct umsdos_info *, int);
-int umsdos_isempty (struct dentry *);
-int umsdos_writeentry (struct dentry *, struct umsdos_info *, int);
-
-/* file.c 25/01/95 02.25.38 */
-
-/* inode.c 12/06/95 09.49.40 */
-void fill_new_filp (struct file *filp, struct dentry *dentry);
-void UMSDOS_read_inode (struct inode *);
-void UMSDOS_write_inode (struct inode *, int);
-int UMSDOS_notify_change (struct dentry *, struct iattr *attr);
-int umsdos_notify_change_locked(struct dentry *, struct iattr *attr);
-void UMSDOS_put_inode (struct inode *);
-int UMSDOS_statfs (struct super_block *, struct statfs *);
-struct super_block *UMSDOS_read_super (struct super_block *, void *, int);
-void UMSDOS_put_super (struct super_block *);
-
-void umsdos_setup_dir(struct dentry *);
-void umsdos_set_dirinfo_new(struct dentry *, off_t);
-void umsdos_patch_dentry_inode (struct dentry *, off_t);
-int umsdos_get_dirowner (struct inode *inode, struct inode **result);
-
-/* ioctl.c 22/06/95 00.22.08 */
-int UMSDOS_ioctl_dir (struct inode *dir,
-	 struct file *filp,
-	 unsigned int cmd,
-	 unsigned long data);
-
-/* mangle.c 25/01/95 02.25.38 */
-void umsdos_manglename (struct umsdos_info *info);
-int umsdos_evalrecsize (int len);
-int umsdos_parse (const char *name,int len, struct umsdos_info *info);
-
-/* namei.c 25/01/95 02.25.38 */
-void umsdos_lockcreate (struct inode *dir);
-void umsdos_startlookup (struct inode *dir);
-void umsdos_unlockcreate (struct inode *dir);
-void umsdos_endlookup (struct inode *dir);
-
-int umsdos_readlink_x (	     struct dentry *dentry,
-			     char *buffer,
-			     int bufsiz);
-int UMSDOS_symlink (struct inode *dir,
-		    struct dentry *dentry,
-		    const char *symname);
-int UMSDOS_link (struct dentry *olddentry,
-		 struct inode *dir,
-		 struct dentry *dentry);
-int UMSDOS_create (struct inode *dir,
-		   struct dentry *dentry,
-		   int mode);
-
-int UMSDOS_mkdir (struct inode *dir,
-		  struct dentry *dentry,
-		  int mode);
-int UMSDOS_mknod (struct inode *dir,
-		  struct dentry *dentry,
-		  int mode,
-		  dev_t rdev);
-int UMSDOS_rmdir (struct inode *dir,struct dentry *dentry);
-int UMSDOS_unlink (struct inode *dir, struct dentry *dentry);
-int UMSDOS_rename (struct inode *old_dir,
-		   struct dentry *old_dentry,
-		   struct inode *new_dir,
-		   struct dentry *new_dentry);
-
-/* rdir.c 22/03/95 03.31.42 */
-struct dentry *umsdos_rlookup_x (struct inode *dir, struct dentry *dentry, int nopseudo);
-struct dentry *UMSDOS_rlookup (struct inode *dir, struct dentry *dentry, struct nameidata *nd);
-
-static inline struct umsdos_inode_info *UMSDOS_I(struct inode *inode)
-{
-	return &inode->u.umsdos_i;
-}
diff --git a/include/linux/umsdos_fs_i.h b/include/linux/umsdos_fs_i.h
deleted file mode 100644
index f4c992b44cd2c1..00000000000000
--- a/include/linux/umsdos_fs_i.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef UMSDOS_FS_I_H
-#define UMSDOS_FS_I_H
-
-#ifndef _LINUX_TYPES_H
-#include <linux/types.h>
-#endif
-
-#include <linux/msdos_fs_i.h>
-#include <linux/pipe_fs_i.h>
-
-/* #Specification: strategy / in memory inode
- * Here is the information specific to the inode of the UMSDOS file
- * system. This information is added to the end of the standard struct
- * inode. Each file system has its own extension to struct inode,
- * so do the umsdos file system.
- * 
- * The strategy is to have the umsdos_inode_info as a superset of
- * the msdos_inode_info, since most of the time the job is done
- * by the msdos fs code.
- * 
- * So we duplicate the msdos_inode_info, and add our own info at the
- * end.
- * 
- * The offset in this EMD file of the entry: pos
- * 
- * 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.
- * 
- * Special file and fifo do have an inode which correspond to an
- * empty MSDOS file.
- * 
- * symlink are processed mostly like regular file. The content is the
- * link.
- * 
- * The UMSDOS specific extension is placed after the union.
- */
-
-struct dir_locking_info {
-	wait_queue_head_t p;
-	short int looking;	/* How many process doing a lookup */
-	short int creating;	/* Is there any creation going on here
-				 *  Only one at a time, although one
-				 *  may recursively lock, so it is a counter
-				 */
-	long pid;		/* pid of the process owning the creation
-				 * lock */
-};
-
-struct umsdos_inode_info {
-	struct msdos_inode_info msdos_info;
-	struct dir_locking_info dir_info;
-	int i_patched;		/* Inode has been patched */
-	int i_is_hlink;		/* Resolved hardlink inode? */
-	off_t pos;		/* Entry offset in the emd_owner file */
-};
-
-#endif