patch-2.3.29 linux/fs/nfs/read.c

• Lines: 72
• Date: Sat Nov 20 10:09:05 1999
• Orig file: v2.3.28/linux/fs/nfs/read.c
• Orig date: Mon Nov 1 13:56:27 1999

diff -u --recursive --new-file v2.3.28/linux/fs/nfs/read.c linux/fs/nfs/read.c
@@ -71,7 +71,7 @@
 {
 	struct nfs_rreq	rqst;
 	unsigned long	offset = page->index << PAGE_CACHE_SHIFT;
-	char		*buffer = (char *) page_address(page);
+	char		*buffer;
 	int		rsize = NFS_SERVER(inode)->rsize;
 	int		result, refresh = 0;
 	int		count = PAGE_SIZE;
@@ -79,6 +79,12 @@
 
 	dprintk("NFS: nfs_readpage_sync(%p)\n", page);
 
+	/*
+	 * This works now because the socket layer never tries to DMA
+	 * into this buffer directly.
+	 */
+	buffer = (char *) kmap(page);	
+
 	do {
 		if (count < rsize)
 			rsize = count;
@@ -116,6 +122,7 @@
 	result = 0;
 
 io_error:
+	kunmap(page);
 	UnlockPage(page);
 	/* Note: we don't refresh if the call returned error */
 	if (refresh && result >= 0)
@@ -152,6 +159,7 @@
 		fail++;
 		dprintk("NFS: %d successful reads, %d failures\n", succ, fail);
 	}
+	kunmap(page);
 	UnlockPage(page);
 	free_page(address);
 
@@ -163,7 +171,7 @@
 nfs_readpage_async(struct dentry *dentry, struct inode *inode,
 			struct page *page)
 {
-	unsigned long address = page_address(page);
+	unsigned long address;
 	struct nfs_rreq	*req;
 	int		result = -1, flags;
 
@@ -177,6 +185,7 @@
 	if (!req)
 		goto out_defer;
 
+	address = kmap(page);	
 	/* Initialize request */
 	/* N.B. Will the dentry remain valid for life of request? */
 	nfs_readreq_setup(req, NFS_FH(dentry), page->index << PAGE_CACHE_SHIFT,
@@ -200,6 +209,7 @@
 	goto out;
 out_free:
 	dprintk("NFS: failed to enqueue async READ request.\n");
+	kunmap(page);
 	kfree(req);
 	goto out;
 }
@@ -254,7 +264,7 @@
 out_error:
 	UnlockPage(page);
 out_free:
-	free_page(page_address(page));
+	__free_page(page);
 out:
 	unlock_kernel();
 	return error;