misc patch for 2.1.56

Bill Hawes (whawes@star.net)
Sun, 14 Sep 1997 10:26:39 -0400


This is a multi-part message in MIME format.
--------------32AD271A9071DDC54BE2763D
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

The attached patch fixes some compilation errors in 56 pre-1.

Regards,
Bill
--------------32AD271A9071DDC54BE2763D
Content-Type: text/plain; charset=us-ascii; name="misc_56-patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="misc_56-patch"

--- linux-2.1.56/include/linux/minix_fs.h.old Thu Jul 24 13:34:38 1997
+++ linux-2.1.56/include/linux/minix_fs.h Sat Sep 13 22:13:22 1997
@@ -121,7 +121,7 @@
extern void minix_write_inode(struct inode *);
extern int minix_statfs(struct super_block *, struct statfs *, int);
extern int minix_sync_inode(struct inode *);
-extern int minix_sync_file(struct inode *, struct file *);
+extern int minix_sync_file(struct file *, struct dentry *);

extern struct inode_operations minix_file_inode_operations;
extern struct inode_operations minix_dir_inode_operations;
--- linux-2.1.56/include/linux/sysv_fs.h.old Sat Sep 13 22:26:32 1997
+++ linux-2.1.56/include/linux/sysv_fs.h Sun Sep 14 08:14:47 1997
@@ -398,8 +398,8 @@
extern void sysv_put_inode(struct inode *);
extern int sysv_statfs(struct super_block *, struct statfs *, int);
extern int sysv_sync_inode(struct inode *);
-extern int sysv_sync_file(struct inode *, struct file *);
-extern int sysv_mmap(struct inode *, struct file *, struct vm_area_struct *);
+extern int sysv_sync_file(struct file *, struct dentry *);
+extern int sysv_mmap(struct file *, struct vm_area_struct *);

extern struct inode_operations sysv_file_inode_operations;
extern struct inode_operations sysv_file_inode_operations_with_bmap;
--- linux-2.1.56/fs/affs/dir.c.old Wed Sep 10 09:21:26 1997
+++ linux-2.1.56/fs/affs/dir.c Wed Sep 10 10:51:32 1997
@@ -82,7 +82,7 @@
struct buffer_head *dir_bh;
struct buffer_head *fh_bh;
struct inode *dir;
- struct inode *inode = file->f_dentry->d_inode;
+ struct inode *inode = filp->f_dentry->d_inode;

pr_debug("AFFS: readdir(ino=%ld,f_pos=%lu)\n",inode->i_ino,filp->f_pos);

--------------32AD271A9071DDC54BE2763D--