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

Commit c95908e4 authored by Fred Isaman's avatar Fred Isaman Committed by Trond Myklebust
Browse files

NFS: fix pnfs regression with directio writes 



Commit 57208fa7 "NFS: Create an write_pageio_init() function"
did not modify the calls in direct.c, preventing direct io from
using pnfs.  This reintroduces that capability.

Signed-off-by: default avatarFred Isaman <iisaman@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 59948db3

fs/nfs/direct.c

+2 −2
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) 
	dreq->count = 0;

	get_dreq(dreq);



	nfs_pageio_init_write(&desc, dreq->inode, FLUSH_STABLE,

	NFS_PROTO(dreq->inode)->write_pageio_init(&desc, dreq->inode, FLUSH_STABLE,

			      &nfs_direct_write_completion_ops);

	desc.pg_dreq = dreq;
@@ -782,7 +782,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, 
	size_t requested_bytes = 0;

	unsigned long seg;



	nfs_pageio_init_write(&desc, inode, FLUSH_COND_STABLE,

	NFS_PROTO(inode)->write_pageio_init(&desc, inode, FLUSH_COND_STABLE,

			      &nfs_direct_write_completion_ops);

	desc.pg_dreq = dreq;

	get_dreq(dreq);