patch-2.1.60 linux/fs/nfs/dir.c

• Lines: 29
• Date: Tue Oct 21 08:57:29 1997
• Orig file: v2.1.59/linux/fs/nfs/dir.c
• Orig date: Mon Oct 20 10:36:52 1997

diff -u --recursive --new-file v2.1.59/linux/fs/nfs/dir.c linux/fs/nfs/dir.c
@@ -52,7 +52,7 @@
 };
 
 static int nfs_dir_open(struct inode * inode, struct file * file);
-static long nfs_dir_read(struct inode *, struct file *, char *, unsigned long);
+static ssize_t nfs_dir_read(struct file *, char *, size_t, loff_t *);
 static int nfs_readdir(struct file *, void *, filldir_t);
 static int nfs_lookup(struct inode *, struct dentry *);
 static int nfs_create(struct inode *, struct dentry *, int);
@@ -107,8 +107,8 @@
 	return nfs_revalidate_inode(NFS_SERVER(dir), dir);
 }
 
-static long
-nfs_dir_read(struct inode *inode, struct file *filp, char *buf, unsigned long count)
+static ssize_t
+nfs_dir_read(struct file *filp, char *buf, size_t count, loff_t *ppos)
 {
 	return -EISDIR;
 }
@@ -317,7 +317,7 @@
 			continue;
 		if (cache->locked) {
 			printk("NFS: cache locked for %s/%ld\n",
-				kdevname(dev), ino);
+				kdevname(dev), (long) ino);
 			continue;
 		}
 		cache->valid = 0;	/* brute force */