Skip to content

Commit df56b38

Browse files
committed
NFSD: Remove nfsd_readv()
nfsd_readv()'s consumers now use nfsd_iter_read(). Signed-off-by: Chuck Lever <[email protected]>
1 parent 703d752 commit df56b38

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

fs/nfsd/vfs.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,21 +1032,6 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
10321032
return nfsd_finish_read(rqstp, fhp, file, offset, count, eof, host_err);
10331033
}
10341034

1035-
__be32 nfsd_readv(struct svc_rqst *rqstp, struct svc_fh *fhp,
1036-
struct file *file, loff_t offset,
1037-
struct kvec *vec, int vlen, unsigned long *count,
1038-
u32 *eof)
1039-
{
1040-
struct iov_iter iter;
1041-
loff_t ppos = offset;
1042-
ssize_t host_err;
1043-
1044-
trace_nfsd_read_vector(rqstp, fhp, offset, *count);
1045-
iov_iter_kvec(&iter, ITER_DEST, vec, vlen, *count);
1046-
host_err = vfs_iter_read(file, &iter, &ppos, 0);
1047-
return nfsd_finish_read(rqstp, fhp, file, offset, count, eof, host_err);
1048-
}
1049-
10501035
/**
10511036
* nfsd_iter_read - Perform a VFS read using an iterator
10521037
* @rqstp: RPC transaction context

fs/nfsd/vfs.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,6 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
110110
struct file *file, loff_t offset,
111111
unsigned long *count,
112112
u32 *eof);
113-
__be32 nfsd_readv(struct svc_rqst *rqstp, struct svc_fh *fhp,
114-
struct file *file, loff_t offset,
115-
struct kvec *vec, int vlen,
116-
unsigned long *count,
117-
u32 *eof);
118113
__be32 nfsd_iter_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
119114
struct file *file, loff_t offset,
120115
unsigned long *count, unsigned int base,

0 commit comments

Comments
 (0)