aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-05-28 04:46:32 -0400
committerJ. Bruce Fields <bfields@redhat.com>2014-05-30 17:32:27 -0400
commitb52bd7bccca57b2bbe837d14a0bf3e45279459a8 (patch)
tree0c815d914a4117b33e0daafe9754a5c9570afe9e
parent12337901d654415d9f764b5f5ba50052e9700f37 (diff)
nfsd: remove unused function nfsd_read_file
Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/vfs.c20
-rw-r--r--fs/nfsd/vfs.h2
2 files changed, 0 insertions, 22 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index b7d35a4afefb..140c496f612c 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1026,26 +1026,6 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
1026 return err; 1026 return err;
1027} 1027}
1028 1028
1029/* As above, but use the provided file descriptor. */
1030__be32
1031nfsd_read_file(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
1032 loff_t offset, struct kvec *vec, int vlen,
1033 unsigned long *count)
1034{
1035 __be32 err;
1036
1037 if (file) {
1038 err = nfsd_permission(rqstp, fhp->fh_export, fhp->fh_dentry,
1039 NFSD_MAY_READ|NFSD_MAY_OWNER_OVERRIDE);
1040 if (err)
1041 goto out;
1042 err = nfsd_vfs_read(rqstp, file, offset, vec, vlen, count);
1043 } else /* Note file may still be NULL in NFSv4 special stateid case: */
1044 err = nfsd_read(rqstp, fhp, offset, vec, vlen, count);
1045out:
1046 return err;
1047}
1048
1049/* 1029/*
1050 * Write data to a file. 1030 * Write data to a file.
1051 * The stable flag requests synchronous writes. 1031 * The stable flag requests synchronous writes.
diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
index 7441e9655eb7..91b6ae3f658b 100644
--- a/fs/nfsd/vfs.h
+++ b/fs/nfsd/vfs.h
@@ -80,8 +80,6 @@ int nfsd_readv(struct file *, loff_t, struct kvec *, int,
80 unsigned long *); 80 unsigned long *);
81__be32 nfsd_read(struct svc_rqst *, struct svc_fh *, 81__be32 nfsd_read(struct svc_rqst *, struct svc_fh *,
82 loff_t, struct kvec *, int, unsigned long *); 82 loff_t, struct kvec *, int, unsigned long *);
83__be32 nfsd_read_file(struct svc_rqst *, struct svc_fh *, struct file *,
84 loff_t, struct kvec *, int, unsigned long *);
85__be32 nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *, 83__be32 nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *,
86 loff_t, struct kvec *,int, unsigned long *, int *); 84 loff_t, struct kvec *,int, unsigned long *, int *);
87__be32 nfsd_readlink(struct svc_rqst *, struct svc_fh *, 85__be32 nfsd_readlink(struct svc_rqst *, struct svc_fh *,