VFAT patch for 2.1.79

C. Scott Ananian (cananian@lcs.mit.edu)
Tue, 13 Jan 1998 15:24:04 -0500 (EST)

Attached is the patch to fix compile time errors in the vfat filesystem in
2.1.79.
--Scott
@ @
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-oOO-(_)-OOo-=-=-=-=-=
C. Scott Ananian: cananian@lcs.mit.edu / Declare the Truth boldly and
Laboratory for Computer Science/Crypto / without hindrance.
Massachusetts Institute of Technology /META-PARRESIAS AKOLUTOS:Acts 28:31
-.-. .-.. .. ..-. ..-. --- .-. -.. ... -.-. --- - - .- -. .- -. .. .- -.
PGP key available via finger and from http://www.pdos.lcs.mit.edu/~cananian

diff -ru -X badboys linux-2.1.79-orig/fs/vfat/namei.c linux-2.1.79/fs/vfat/namei.c
--- linux-2.1.79-orig/fs/vfat/namei.c Mon Jan 12 16:34:06 1998
+++ linux-2.1.79/fs/vfat/namei.c Tue Jan 13 15:22:14 1998
@@ -321,7 +321,7 @@

static int vfat_find(struct inode *dir,struct qstr* name,
int find_long,int new_filename,int is_dir,
- struct slot_info *sinfo_out);
+ struct vfat_slot_info *sinfo_out);

/* Checks the validity of a long MS-DOS filename */
/* Returns negative number on error, 0 for a normal
@@ -519,7 +519,7 @@
int res;
int spaces;
char buf[8];
- struct slot_info sinfo;
+ struct vfat_slot_info sinfo;
const char *name_start;
struct qstr qname;

@@ -992,7 +992,7 @@
}

static int vfat_find(struct inode *dir,struct qstr* qname,
- int find_long, int new_filename,int is_dir,struct slot_info *sinfo_out)
+ int find_long, int new_filename,int is_dir,struct vfat_slot_info *sinfo_out)
{
struct super_block *sb = dir->i_sb;
struct vfat_find_info vf;
@@ -1118,7 +1118,7 @@
int vfat_lookup(struct inode *dir,struct dentry *dentry)
{
int res;
- struct slot_info sinfo;
+ struct vfat_slot_info sinfo;
struct inode *result;

PRINTK (("vfat_lookup: name=%s, len=%d\n",
@@ -1162,7 +1162,7 @@
loff_t offset;
struct buffer_head *bh;
struct msdos_dir_entry *de;
- struct slot_info sinfo;
+ struct vfat_slot_info sinfo;

*result=0;
PRINTK(("vfat_create_entry 1\n"));
@@ -1388,7 +1388,7 @@
return 0;
}

-static int vfat_remove_entry(struct inode *dir,struct slot_info *sinfo,
+static int vfat_remove_entry(struct inode *dir,struct vfat_slot_info *sinfo,
struct buffer_head **bh,struct dentry* dentry,
int is_dir,int nospc)
{
@@ -1428,7 +1428,7 @@
struct super_block *sb = dir->i_sb;
int res;
struct buffer_head *bh;
- struct slot_info sinfo;
+ struct vfat_slot_info sinfo;

res = vfat_find(dir,&dentry->d_name,1,0,0,&sinfo);

@@ -1463,7 +1463,7 @@
struct super_block *sb = dir->i_sb;
int res;
struct buffer_head *bh;
- struct slot_info sinfo;
+ struct vfat_slot_info sinfo;

bh = NULL;
res = vfat_find(dir,&dentry->d_name,1,0,0,&sinfo);
@@ -1540,7 +1540,7 @@
struct dentry *walk;
int res, is_dir, i;
int locked = 0;
- struct slot_info sinfo;
+ struct vfat_slot_info sinfo;

PRINTK(("vfat_rename 1\n"));
if (old_dir == new_dir &&