patch-2.2.3 linux/fs/nfs/inode.c

• Lines: 23
• Date: Wed Mar 3 11:17:02 1999
• Orig file: v2.2.2/linux/fs/nfs/inode.c
• Orig date: Thu Jan 7 15:11:40 1999

diff -u --recursive --new-file v2.2.2/linux/fs/nfs/inode.c linux/fs/nfs/inode.c
@@ -597,10 +597,8 @@
 		sattr.gid = attr->ia_gid;
 
 	sattr.size = (u32) -1;
-	if ((attr->ia_valid & ATTR_SIZE) && S_ISREG(inode->i_mode)) {
+	if ((attr->ia_valid & ATTR_SIZE) && S_ISREG(inode->i_mode))
 		sattr.size = attr->ia_size;
-		nfs_flush_trunc(inode, sattr.size);
-	}
 
 	sattr.mtime.seconds = sattr.mtime.useconds = (u32) -1;
 	if (attr->ia_valid & ATTR_MTIME) {
@@ -613,6 +611,10 @@
 		sattr.atime.seconds = attr->ia_atime;
 		sattr.atime.useconds = 0;
 	}
+
+	error = nfs_wb_all(inode);
+	if (error)
+		goto out;
 
 	error = nfs_proc_setattr(NFS_DSERVER(dentry), NFS_FH(dentry),
 				&sattr, &fattr);