nfs: remove nfs_inode_dio_wait
Just call inode_dio_wait directly instead of through a pointless wrapper. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
parent
4ff79bc709
commit
95d9f6c3ed
|
@ -272,7 +272,7 @@ nfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)
|
||||||
|
|
||||||
trace_nfs_fsync_enter(inode);
|
trace_nfs_fsync_enter(inode);
|
||||||
|
|
||||||
nfs_inode_dio_wait(inode);
|
inode_dio_wait(inode);
|
||||||
do {
|
do {
|
||||||
ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
|
ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
|
||||||
if (ret != 0)
|
if (ret != 0)
|
||||||
|
@ -370,7 +370,7 @@ start:
|
||||||
/*
|
/*
|
||||||
* Wait for O_DIRECT to complete
|
* 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);
|
page = grab_cache_page_write_begin(mapping, index, flags);
|
||||||
if (!page)
|
if (!page)
|
||||||
|
|
|
@ -141,7 +141,7 @@ void nfs_evict_inode(struct inode *inode)
|
||||||
|
|
||||||
int nfs_sync_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);
|
return nfs_wb_all(inode);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(nfs_sync_inode);
|
EXPORT_SYMBOL_GPL(nfs_sync_inode);
|
||||||
|
|
|
@ -515,10 +515,6 @@ extern int nfs_sillyrename(struct inode *dir, struct dentry *dentry);
|
||||||
/* direct.c */
|
/* direct.c */
|
||||||
void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo,
|
void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo,
|
||||||
struct nfs_direct_req *dreq);
|
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);
|
extern ssize_t nfs_dreq_bytes_left(struct nfs_direct_req *dreq);
|
||||||
|
|
||||||
/* nfs4proc.c */
|
/* nfs4proc.c */
|
||||||
|
|
Loading…
Reference in New Issue