Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b924e5f authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Clean up the callers of nfs_wb_all() 



There is no need to flush out writes before calling nfs_wb_all().

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent af7fa165

fs/nfs/delegation.c

+1 −9
Original line number Diff line number Diff line
@@ -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);

		}

	}

fs/nfs/inode.c

+1 −3
Original line number Diff line number Diff line
@@ -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)