[v1,6/6] NFSD: Remove nfsd_readv()

Commit Message

Chuck Lever May 18, 2023, 5:46 p.m. UTC

From: Chuck Lever <[e-mail]>

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

Signed-off-by: Chuck Lever <[e-mail]>
---
 fs/nfsd/vfs.c |   15 ---------------
 fs/nfsd/vfs.h |    5 -----
 2 files changed, 20 deletions(-)

Patch

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 13ccd385b308..1053c81f82f1 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1024,21 +1024,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
diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
index 6381a2890b0b..a6890ea7b765 100644
--- a/fs/nfsd/vfs.h
+++ b/fs/nfsd/vfs.h
@@ -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,