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

Commit a4058c5b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

nfsd: remove nfsd_vfs_read 



Simpler done in the only caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 73da852e

fs/nfsd/vfs.c

+6 −11
Original line number Diff line number Diff line
@@ -920,16 +920,6 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen, 
	return nfsd_finish_read(file, count, host_err);

}



static __be32

nfsd_vfs_read(struct svc_rqst *rqstp, struct file *file,

	      loff_t offset, struct kvec *vec, int vlen, unsigned long *count)

{

	if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &rqstp->rq_flags))

		return nfsd_splice_read(rqstp, file, offset, count);

	else

		return nfsd_readv(file, offset, vec, vlen, count);

}



/*

 * Gathered writes: If another process is currently writing to the file,

 * there's a high chance this is another nfsd (triggered by a bulk write
@@ -1041,7 +1031,12 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp, 
	ra = nfsd_init_raparms(file);



	trace_read_opened(rqstp, fhp, offset, vlen);

	err = nfsd_vfs_read(rqstp, file, offset, vec, vlen, count);



	if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &rqstp->rq_flags))

		err = nfsd_splice_read(rqstp, file, offset, count);

	else

		err = nfsd_readv(file, offset, vec, vlen, count);



	trace_read_io_done(rqstp, fhp, offset, vlen);



	if (ra)