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

Commit b52bd7bc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by J. Bruce Fields
Browse files

nfsd: remove unused function nfsd_read_file 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 12337901

fs/nfsd/vfs.c

+0 −20
Original line number Diff line number Diff line
@@ -1026,26 +1026,6 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp, 
	return err;

}



/* As above, but use the provided file descriptor. */

__be32

nfsd_read_file(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,

		loff_t offset, struct kvec *vec, int vlen,

		unsigned long *count)

{

	__be32		err;



	if (file) {

		err = nfsd_permission(rqstp, fhp->fh_export, fhp->fh_dentry,

				NFSD_MAY_READ|NFSD_MAY_OWNER_OVERRIDE);

		if (err)

			goto out;

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

	} else /* Note file may still be NULL in NFSv4 special stateid case: */

		err = nfsd_read(rqstp, fhp, offset, vec, vlen, count);

out:

	return err;

}



/*

 * Write data to a file.

 * The stable flag requests synchronous writes.

fs/nfsd/vfs.h

+0 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ int 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 *);

__be32 		nfsd_read_file(struct svc_rqst *, struct svc_fh *, struct file *,

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

__be32 		nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *,

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

__be32		nfsd_readlink(struct svc_rqst *, struct svc_fh *,