Hi Trond,
On 06/21/2016 05:34 PM, Trond Myklebust wrote:
> Now that we can serialise O_DIRECT and write/truncate using the
> inode->i_rwsem, we no longer need inode->i_dio_count.
I'm seeing cthon basic tests fail on all NFS versions after applying this patch:
./test5: read and write
./test5: (/nfs/basic) 'bigfile' has size 8192, should be 1048576
basic tests failed
Just thought you should know :)
Anna
>
> Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
> ---
> fs/nfs/direct.c | 12 +++---------
> fs/nfs/file.c | 2 --
> fs/nfs/inode.c | 1 -
> 3 files changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
> index 2333e9973802..92267316290a 100644
> --- a/fs/nfs/direct.c
> +++ b/fs/nfs/direct.c
> @@ -385,11 +385,6 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq, bool write)
> spin_unlock(&inode->i_lock);
> }
>
> - if (write)
> - nfs_zap_mapping(inode, inode->i_mapping);
> -
> - inode_dio_end(inode);
> -
> if (dreq->iocb) {
> long res = (long) dreq->error;
> if (!res)
> @@ -488,7 +483,6 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq,
> &nfs_direct_read_completion_ops);
> get_dreq(dreq);
> desc.pg_dreq = dreq;
> - inode_dio_begin(inode);
>
> while (iov_iter_count(iter)) {
> struct page **pagevec;
> @@ -540,7 +534,6 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq,
> * generic layer handle the completion.
> */
> if (requested_bytes == 0) {
> - inode_dio_end(inode);
> nfs_direct_req_release(dreq);
> return result < 0 ? result : -EIO;
> }
> @@ -770,6 +763,7 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)
> static void nfs_direct_write_schedule_work(struct work_struct *work)
> {
> struct nfs_direct_req *dreq = container_of(work, struct nfs_direct_req, work);
> + struct inode *inode = dreq->inode;
> int flags = dreq->flags;
>
> dreq->flags = 0;
> @@ -781,6 +775,8 @@ static void nfs_direct_write_schedule_work(struct work_struct *work)
> nfs_direct_write_reschedule(dreq);
> break;
> default:
> + nfs_zap_mapping(inode, inode->i_mapping);
> +
> nfs_direct_complete(dreq, true);
> }
> }
> @@ -903,7 +899,6 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq,
> &nfs_direct_write_completion_ops);
> desc.pg_dreq = dreq;
> get_dreq(dreq);
> - inode_dio_begin(inode);
>
> NFS_I(inode)->write_io += iov_iter_count(iter);
> while (iov_iter_count(iter)) {
> @@ -964,7 +959,6 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq,
> * generic layer handle the completion.
> */
> if (requested_bytes == 0) {
> - inode_dio_end(inode);
> nfs_direct_req_release(dreq);
> return result < 0 ? result : -EIO;
> }
> diff --git a/fs/nfs/file.c b/fs/nfs/file.c
> index b1dd7f2c64f4..fb7a1b0b6a20 100644
> --- a/fs/nfs/file.c
> +++ b/fs/nfs/file.c
> @@ -276,7 +276,6 @@ nfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)
>
> trace_nfs_fsync_enter(inode);
>
> - inode_dio_wait(inode);
> do {
> ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
> if (ret != 0)
> @@ -364,7 +363,6 @@ start:
> /*
> * Wait for O_DIRECT to complete
> */
> - 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 bd0390da3344..6bc65ffc3c6c 100644
> --- a/fs/nfs/inode.c
> +++ b/fs/nfs/inode.c
> @@ -141,7 +141,6 @@ void nfs_evict_inode(struct inode *inode)
>
> int nfs_sync_inode(struct inode *inode)
> {
> - inode_dio_wait(inode);
> return nfs_wb_all(inode);
> }
> EXPORT_SYMBOL_GPL(nfs_sync_inode);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
