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>

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index cdf8621886180bbf95af3c4e5d704bad63e762bc..89bf093d342a583d0d3c19738a2baebf046c68e2 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -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 @@ start:
        /*
         * 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)

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 86faecf8f328f2639bab1c5f7391df6d659610f2..33d18c4119057bb874604398337a990e94b5f9c4 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -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);

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index c41c5f5baf036efc7145c726a6936ea75c63f450..565f8135ae1fdeb3bdce2c5797451d652c501b4b 100644 (file)
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -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 */