patch-1.3.68 linux/fs/nfs/file.c

• Lines: 33
• Date: Thu Feb 22 14:29:35 1996
• Orig file: v1.3.67/linux/fs/nfs/file.c
• Orig date: Tue Feb 20 14:37:26 1996

diff -u --recursive --new-file v1.3.67/linux/fs/nfs/file.c linux/fs/nfs/file.c
@@ -81,7 +81,7 @@
 			return;
 		NFS_OLDMTIME(inode) = fattr.mtime.seconds;
 	}
-	invalidate_inode_pages(inode, 0);
+	invalidate_inode_pages(inode);
 }
 
 
@@ -118,18 +118,15 @@
 		result = nfs_proc_read(NFS_SERVER(inode), NFS_FH(inode), 
 			pos, rsize, buf, &fattr);
 		if (result < 0)
-			goto partial;
+			break;
 		refresh = 1;
-		count -= rsize;
-		pos += rsize;
-		buf += rsize;
+		count -= result;
+		pos += result;
+		buf += result;
 		if (result < rsize)
-			goto partial;
+			break;
 	} while (count);
-	nfs_refresh_inode(inode, &fattr);
-	return;
 
-partial:
 	memset(buf, 0, count);
 	if (refresh)
 		nfs_refresh_inode(inode, &fattr);