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

• Lines: 36
• Date: Mon Nov 23 13:46:35 1998
• Orig file: v2.1.129/linux/fs/nfs/file.c
• Orig date: Thu Nov 19 09:56:28 1998

diff -u --recursive --new-file v2.1.129/linux/fs/nfs/file.c linux/fs/nfs/file.c
@@ -91,14 +91,13 @@
 static int
 nfs_file_close(struct inode *inode, struct file *file)
 {
-	int	status, error;
+	int	status;
 
 	dfprintk(VFS, "nfs: close(%x/%ld)\n", inode->i_dev, inode->i_ino);
 
-	status = nfs_wbinval(inode);
-	error = nfs_write_error(inode);
+	status = nfs_wb_all(inode);
 	if (!status)
-		status = error;
+		status = nfs_write_error(inode);
 	return status;
 }
 
@@ -158,14 +157,13 @@
 nfs_fsync(struct file *file, struct dentry *dentry)
 {
 	struct inode *inode = dentry->d_inode;
-	int status, error;
+	int status;
 
 	dfprintk(VFS, "nfs: fsync(%x/%ld)\n", inode->i_dev, inode->i_ino);
 
-	status = nfs_wbinval_pid(inode, current->pid);
-	error = nfs_write_error(inode);
+	status = nfs_wb_pid(inode, current->pid);
 	if (!status)
-		status = error;
+		status = nfs_write_error(inode);
 	return status;
 }