From 38c7e9fc7f2674c9e8c6693938eb538dddcd4afb Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Sat, 31 Jul 2010 14:29:06 -0400 Subject: [PATCH] --- yaml --- r: 206399 b: refs/heads/master c: 1b924e5f878e3cd62a20bd8dbf3b911a40185a99 h: refs/heads/master i: 206397: b38c7204ffda6880710af18f24001c5ef8e55e2e 206395: 4a8fc0ce58ca6759c31b359cd4d1f57fb6e65779 206391: 68ff426ea87562ae299166164f40e48dd0b3be5d 206383: d093c1b84327f888cde33ee66a93cf3ad49c072c 206367: 6518f98cb27332778c3fee39bf3677c2a981fa01 206335: 441ebf90dfa055e850fa28d0f59d494ae0757d22 v: v3 --- [refs] | 2 +- trunk/fs/nfs/delegation.c | 10 +--------- trunk/fs/nfs/inode.c | 4 +--- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 957798181ba8..4d314bd5badb 100644 --- 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 index f34f4ac52b81..b9c3c43cea1d 100644 --- 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 index ec7a8f96a2c2..581d8f081e68 100644 --- 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)