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

Next file: linux/fs/ncpfs/mmap.c
Previous file: linux/fs/minix/dir.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.54/linux/fs/ncpfs/dir.c linux/fs/ncpfs/dir.c
@@ -31,7 +31,7 @@
  ncp_dir_read(struct inode *inode, struct file *filp, char *buf, unsigned long count);
 
 static int
- ncp_readdir(struct inode *inode, struct file *filp,
+ ncp_readdir(struct file *filp,
 	     void *dirent, filldir_t filldir);
 
 static int
@@ -210,12 +210,13 @@
 	wake_up(&c_wait);
 }
 
-static int ncp_readdir(struct inode *inode, struct file *filp,
+static int ncp_readdir(struct file *filp,
 		       void *dirent, filldir_t filldir)
 {
 	int result = 0;
 	int i = 0;
 	int index = 0;
+	struct inode *inode = file->f_dentry->d_inode;
 	struct ncp_dirent *entry = NULL;
 	struct ncp_server *server = NCP_SERVER(inode);
 	struct ncp_inode_info *dir = NCP_INOP(inode);

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