I was able to compile (v)fat and sb as modules after I made few changes to
drivers/sound/Defines
fs/vfat/namei.c
include/linux/msdos_fs.h
Jani Hakala
--SLDf9lqlvOQaIe6s
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="2.1.79-fat.patch"
--- linux/fs/vfat/namei.c.fix79 Tue Jan 13 10:04:42 1998
+++ linux/fs/vfat/namei.c Tue Jan 13 09:56:55 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 &&
--- linux/include/linux/msdos_fs.h.fix79 Tue Jan 13 17:33:21 1998
+++ linux/include/linux/msdos_fs.h Tue Jan 13 17:43:23 1998
@@ -222,7 +222,7 @@
extern void cache_init(void);
void cache_lookup(struct inode *inode,int cluster,int *f_clu,int *d_clu);
void cache_add(struct inode *inode,int f_clu,int d_clu);
-int get_cluster(struct inode *inode,int cluster);
+int fat_get_cluster(struct inode *inode,int cluster);
/* inode.c */
extern int fat_bmap(struct inode *inode,int block);
@@ -256,7 +256,7 @@
/* mmap.c */
extern int fat_mmap(struct file *, struct vm_area_struct *);
-extern int fat_readpage(struct inode *, struct page *);
+extern int fat_readpage(struct inode * inode, struct page * page);
/* vfat.c */
--- linux/drivers/sound/Defines.fix79 Tue Jan 13 09:21:24 1998
+++ linux/drivers/sound/Defines Tue Jan 13 10:02:41 1998
@@ -97,12 +97,6 @@
endif
endif
-ifdef CONFIG_SB
-ifneq ($(CONFIG_UART401),Y)
-CONFIG_UART401=y
-endif
-endif
-
ifdef CONFIG_TRIX
ifneq ($(CONFIG_UART401),Y)
CONFIG_UART401=y
--SLDf9lqlvOQaIe6s--