patch-2.4.0-test11 linux/fs/nfs/dir.c

Next file: linux/fs/nfs/inode.c
Previous file: linux/fs/ncpfs/symlink.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test10/linux/fs/nfs/dir.c linux/fs/nfs/dir.c
@@ -97,7 +97,7 @@
 {
 	struct file	*file = desc->file;
 	struct inode	*inode = file->f_dentry->d_inode;
-	void		*buffer = (void *)kmap(page);
+	void		*buffer = kmap(page);
 	int		plus = NFS_USE_READDIRPLUS(inode);
 	int		error;
 
@@ -145,7 +145,7 @@
 int find_dirent(nfs_readdir_descriptor_t *desc, struct page *page)
 {
 	struct nfs_entry *entry = desc->entry;
-	char		*start = (char *)kmap(page),
+	char		*start = kmap(page),
 			*p = start;
 	int		loop_count = 0,
 			status = 0;
@@ -251,7 +251,7 @@
 {
 	struct file	*file = desc->file;
 	struct nfs_entry *entry = desc->entry;
-	char		*start = (char *)kmap(desc->page),
+	char		*start = kmap(desc->page),
 			*p = start + desc->page_offset;
 	unsigned long	fileid;
 	int		loop_count = 0,
@@ -323,7 +323,7 @@
 		status = -ENOMEM;
 		goto out;
 	}
-	p = (u32 *)kmap(page);
+	p = kmap(page);
 	status = NFS_PROTO(inode)->readdir(file, desc->target, p,
 					   NFS_SERVER(inode)->dtsize, 0);
 	if (status >= 0) {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)