Commit df56b384 authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Remove nfsd_readv() 



nfsd_readv()'s consumers now use nfsd_iter_read().

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 703d7521

fs/nfsd/vfs.c

+0 −15
Original line number Diff line number Diff line
@@ -1032,21 +1032,6 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp, 
	return nfsd_finish_read(rqstp, fhp, file, offset, count, eof, host_err);

}



__be32 nfsd_readv(struct svc_rqst *rqstp, struct svc_fh *fhp,

		  struct file *file, loff_t offset,

		  struct kvec *vec, int vlen, unsigned long *count,

		  u32 *eof)

{

	struct iov_iter iter;

	loff_t ppos = offset;

	ssize_t host_err;



	trace_nfsd_read_vector(rqstp, fhp, offset, *count);

	iov_iter_kvec(&iter, ITER_DEST, vec, vlen, *count);

	host_err = vfs_iter_read(file, &iter, &ppos, 0);

	return nfsd_finish_read(rqstp, fhp, file, offset, count, eof, host_err);

}



/**

 * nfsd_iter_read - Perform a VFS read using an iterator

 * @rqstp: RPC transaction context

fs/nfsd/vfs.h

+0 −5
Original line number Diff line number Diff line
@@ -110,11 +110,6 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp, 
				struct file *file, loff_t offset,

				unsigned long *count,

				u32 *eof);

__be32		nfsd_readv(struct svc_rqst *rqstp, struct svc_fh *fhp,

				struct file *file, loff_t offset,

				struct kvec *vec, int vlen,

				unsigned long *count,

				u32 *eof);

__be32		nfsd_iter_read(struct svc_rqst *rqstp, struct svc_fh *fhp,

				struct file *file, loff_t offset,

				unsigned long *count, unsigned int base,