NFSD: Remove nfsd_readv()

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

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 37febe1ff039d13b638ae4d2cec650e6abebfdca..59b7d60ae33eab5601bab1678d9603fee4de63c5 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -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

diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
index 6381a2890b0b146da225644d5caa4f1f752ed3d7..a6890ea7b765b654f970ba08adeade06164d2b7c 100644 (file)
--- 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,