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

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

diff -u --recursive --new-file v2.3.23/linux/fs/nfs/dir.c linux/fs/nfs/dir.c
@@ -255,7 +255,7 @@
 again:
 	cur_off = 0;
 	for (;;) {
-		page = find_get_page(inode, cur_off);
+		page = find_get_page(&inode->i_data, cur_off);
 		if (page) {
 			if (!Page_Uptodate(page))
 				goto out_error;
@@ -332,16 +332,16 @@
 		goto out;
 	}
 
-	hash = page_hash(inode, offset);
+	hash = page_hash(&inode->i_data, offset);
 repeat:
-	page = __find_lock_page(inode, offset, hash);
+	page = __find_lock_page(&inode->i_data, offset, hash);
 	if (page) {
 		page_cache_free(page_cache);
 		goto unlock_out;
 	}
 
 	page = page_cache;
-	if (add_to_page_cache_unique(page, inode, offset, hash)) {
+	if (add_to_page_cache_unique(page, &inode->i_data, offset, hash)) {
 		page_cache_release(page);
 		goto repeat;
 	}
@@ -431,8 +431,8 @@
 	if ((offset = nfs_readdir_offset(inode, filp->f_pos)) < 0)
 		goto no_dirent_page;
 
-	hash = page_hash(inode, offset);
-	page = __find_get_page(inode, offset, hash);
+	hash = page_hash(&inode->i_data, offset);
+	page = __find_get_page(&inode->i_data, offset, hash);
 	if (!page)
 		goto no_dirent_page;
 	if (!Page_Uptodate(page))

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