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

Commit 95d9f6c3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Trond Myklebust
Browse files

nfs: remove nfs_inode_dio_wait 



Just call inode_dio_wait directly instead of through a pointless wrapper.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 4ff79bc7

fs/nfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ nfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync) 


	trace_nfs_fsync_enter(inode);



	nfs_inode_dio_wait(inode);

	inode_dio_wait(inode);

	do {

		ret = filemap_write_and_wait_range(inode->i_mapping, start, end);

		if (ret != 0)
@@ -370,7 +370,7 @@ static int nfs_write_begin(struct file *file, struct address_space *mapping, 
	/*

	 * Wait for O_DIRECT to complete

	 */

	nfs_inode_dio_wait(mapping->host);

	inode_dio_wait(mapping->host);



	page = grab_cache_page_write_begin(mapping, index, flags);

	if (!page)

fs/nfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ void nfs_evict_inode(struct inode *inode) 


int nfs_sync_inode(struct inode *inode)

{

	nfs_inode_dio_wait(inode);

	inode_dio_wait(inode);

	return nfs_wb_all(inode);

}

EXPORT_SYMBOL_GPL(nfs_sync_inode);

fs/nfs/internal.h

+0 −4
Original line number Diff line number Diff line
@@ -515,10 +515,6 @@ extern int nfs_sillyrename(struct inode *dir, struct dentry *dentry); 
/* direct.c */

void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo,

			      struct nfs_direct_req *dreq);

static inline void nfs_inode_dio_wait(struct inode *inode)

{

	inode_dio_wait(inode);

}

extern ssize_t nfs_dreq_bytes_left(struct nfs_direct_req *dreq);



/* nfs4proc.c */