patch-2.1.55 linux/fs/affs/dir.c

Next file: linux/fs/affs/inode.c
Previous file: linux/drivers/scsi/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.54/linux/fs/affs/dir.c linux/fs/affs/dir.c
@@ -23,7 +23,7 @@
 #include <linux/mm.h>
 #include <linux/amigaffs.h>
 
-static int affs_readdir(struct inode *, struct file *, void *, filldir_t);
+static int affs_readdir(struct file *, void *, filldir_t);
 static long affs_dir_read(struct inode * inode, struct file * filp, char * buf,
 			  unsigned long count);
 
@@ -69,7 +69,7 @@
 }
 
 static int
-affs_readdir(struct inode *inode, struct file *filp, void *dirent, filldir_t filldir)
+affs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
 	int			 j, namelen;
 	s32			 i;
@@ -82,6 +82,7 @@
 	struct buffer_head	 *dir_bh;
 	struct buffer_head	 *fh_bh;
 	struct inode		 *dir;
+	struct inode 		 *inode = file->f_dentry->d_inode;
 
 	pr_debug("AFFS: readdir(ino=%ld,f_pos=%lu)\n",inode->i_ino,filp->f_pos);
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov