---

yaml --- r: 206399 b: refs/heads/master c: 1b924e5 h: refs/heads/master i: 206397: b38c720 206395: 4a8fc0c 206391: 68ff426 206383: d093c1b 206367: 6518f98 206335: 441ebf9 v: v3
git-mirror · Aug 4, 2010 · 38c7e9f · 38c7e9f
1 parent aa74f21
commit 38c7e9f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af7fa16506bf9b6323e862a61e14c20555152bb3
+refs/heads/master: 1b924e5f878e3cd62a20bd8dbf3b911a40185a99
diff --git a/trunk/fs/nfs/delegation.c b/trunk/fs/nfs/delegation.c
@@ -268,14 +268,6 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct
 	return status;
 }
 
-/* Sync all data to disk upon delegation return */
-static void nfs_msync_inode(struct inode *inode)
-{
-	filemap_fdatawrite(inode->i_mapping);
-	nfs_wb_all(inode);
-	filemap_fdatawait(inode->i_mapping);
-}
-
 /*
  * Basic procedure for returning a delegation to the server
  */
@@ -367,7 +359,7 @@ int nfs_inode_return_delegation(struct inode *inode)
 		delegation = nfs_detach_delegation_locked(nfsi, NULL, clp);
 		spin_unlock(&clp->cl_lock);
 		if (delegation != NULL) {
-			nfs_msync_inode(inode);
+			nfs_wb_all(inode);
 			err = __nfs_inode_return_delegation(inode, delegation, 1);
 		}
 	}

diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
@@ -413,10 +413,8 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
 		return 0;
 
 	/* Write all dirty data */
-	if (S_ISREG(inode->i_mode)) {
-		filemap_write_and_wait(inode->i_mapping);
+	if (S_ISREG(inode->i_mode))
 		nfs_wb_all(inode);
-	}
 
 	fattr = nfs_alloc_fattr();
 	if (fattr == NULL)