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

Commit e2afc819 authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

nfsd: nfsd_splice_read and nfsd_readv should return __be32 



The callers expect a __be32 return and the functions they call return
__be32, so having these return int is just wrong. Also, nfsd_finish_read
can be made static.

Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent b3d8d128

fs/nfsd/vfs.c

+4 −3
Original line number Diff line number Diff line
@@ -819,7 +819,8 @@ static int nfsd_direct_splice_actor(struct pipe_inode_info *pipe, 
	return __splice_from_pipe(pipe, sd, nfsd_splice_actor);

}



__be32 nfsd_finish_read(struct file *file, unsigned long *count, int host_err)

static __be32

nfsd_finish_read(struct file *file, unsigned long *count, int host_err)

{

	if (host_err >= 0) {

		nfsdstats.io_read += host_err;
@@ -830,7 +831,7 @@ __be32 nfsd_finish_read(struct file *file, unsigned long *count, int host_err) 
		return nfserrno(host_err);

}



int nfsd_splice_read(struct svc_rqst *rqstp,

__be32 nfsd_splice_read(struct svc_rqst *rqstp,

		     struct file *file, loff_t offset, unsigned long *count)

{

	struct splice_desc sd = {
@@ -846,7 +847,7 @@ int nfsd_splice_read(struct svc_rqst *rqstp, 
	return nfsd_finish_read(file, count, host_err);

}



int nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,

__be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,

		unsigned long *count)

{

	mm_segment_t oldfs;

fs/nfsd/vfs.h

+2 −2
Original line number Diff line number Diff line
@@ -74,9 +74,9 @@ struct raparms; 
__be32		nfsd_get_tmp_read_open(struct svc_rqst *, struct svc_fh *,

				struct file **, struct raparms **);

void		nfsd_put_tmp_read_open(struct file *, struct raparms *);

int		nfsd_splice_read(struct svc_rqst *,

__be32		nfsd_splice_read(struct svc_rqst *,

				struct file *, loff_t, unsigned long *);

int		nfsd_readv(struct file *, loff_t, struct kvec *, int,

__be32		nfsd_readv(struct file *, loff_t, struct kvec *, int,

				unsigned long *);

__be32 		nfsd_read(struct svc_rqst *, struct svc_fh *,

				loff_t, struct kvec *, int, unsigned long *);