nfsd: remove unused function nfsd_read_file
Subsystems (2)
PATCH 1/1 nfsd: remove unused function nfsd_read_file
Signed-off-by Christoph Hellwig <[email protected]>
--- fs/nfsd/vfs.c | 20 -------------------- fs/nfsd/vfs.h | 2 -- 2 files changed, 22 deletions(-)
fs/nfsd/vfs.c +0 -20
@@ -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
@@ -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 *,
Signature · 1 line
1.7.10.4
Quoted 1 line · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>
Oops, thanks.--b.
Quoted 52 lines
--- fs/nfsd/vfs.c | 20 -------------------- fs/nfsd/vfs.h | 2 -- 2 files changed, 22 deletions(-)fs/nfsd/vfs.c +0
-20@@ -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@@ -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 *,Signature · 1 line
1.7.10.4