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

Commit d4a8f367 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Fix nfs_direct_dirty_pages() 



We only need to dirty the pages that were actually read in.

Also convert nfs_direct_dirty_pages() to call set_page_dirty() instead of
set_page_dirty_lock(). A call to lock_page() is unacceptable in an rpciod
callback function.

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

fs/nfs/direct.c

+18 −11
Original line number Diff line number Diff line
@@ -122,13 +122,19 @@ ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_ 
	return -EINVAL;

}



static void nfs_direct_dirty_pages(struct page **pages, unsigned int npages)

static void nfs_direct_dirty_pages(struct page **pages, unsigned int pgbase, size_t count)

{

	unsigned int npages;

	unsigned int i;



	if (count == 0)

		return;

	pages += (pgbase >> PAGE_SHIFT);

	npages = (count + (pgbase & ~PAGE_MASK) + PAGE_SIZE - 1) >> PAGE_SHIFT;

	for (i = 0; i < npages; i++) {

		struct page *page = pages[i];

		if (!PageCompound(page))

			set_page_dirty_lock(page);

			set_page_dirty(page);

	}

}
@@ -224,17 +230,18 @@ static void nfs_direct_read_result(struct rpc_task *task, void *calldata) 
	if (nfs_readpage_result(task, data) != 0)

		return;



	nfs_direct_dirty_pages(data->pagevec, data->npages);

	nfs_direct_release_pages(data->pagevec, data->npages);



	spin_lock(&dreq->lock);



	if (likely(task->tk_status >= 0))

		dreq->count += data->res.count;

	else

	if (unlikely(task->tk_status < 0)) {

		dreq->error = task->tk_status;



		spin_unlock(&dreq->lock);

	} else {

		dreq->count += data->res.count;

		spin_unlock(&dreq->lock);

		nfs_direct_dirty_pages(data->pagevec,

				data->args.pgbase,

				data->res.count);

	}

	nfs_direct_release_pages(data->pagevec, data->npages);



	if (put_dreq(dreq))

		nfs_direct_complete(dreq);