summaryrefslogtreecommitdiff
path: root/include/linux/nfsd
diff options
context:
space:
mode:
authorNeil Brown <neilb@cse.unsw.edu.au>2004-08-22 23:02:07 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-08-22 23:02:07 -0700
commit2b9b6f10f252c095dd047c26a3bdec599588d42a (patch)
treeb59d026eb67ef7b5d8416efaf3b7fa84bfb53bad /include/linux/nfsd
parent08dd6c30a33d5313d0fe97af1c276e1aa5cd28ca (diff)
[PATCH] kNFSd: get rid of open_private_file
This is only used by nfsd to save one kmalloc, and the code is not always kept up-to-date with dentry_open, so just get rid of it. Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/nfsd')
-rw-r--r--include/linux/nfsd/nfsd.h2
-rw-r--r--include/linux/nfsd/state.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index cf19de2876f1..bf8143c8c133 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -94,7 +94,7 @@ int nfsd_commit(struct svc_rqst *, struct svc_fh *,
loff_t, unsigned long);
#endif /* CONFIG_NFSD_V3 */
int nfsd_open(struct svc_rqst *, struct svc_fh *, int,
- int, struct file *);
+ int, struct file **);
void nfsd_close(struct file *);
int nfsd_read(struct svc_rqst *, struct svc_fh *,
loff_t, struct kvec *,int, unsigned long *);
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 32ffcd82d2ce..97d84c887853 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -218,7 +218,7 @@ struct nfs4_stateid {
struct nfs4_stateowner * st_stateowner;
struct nfs4_file * st_file;
stateid_t st_stateid;
- struct file st_vfs_file;
+ struct file * st_vfs_file;
int st_vfs_set;
unsigned long st_access_bmap;
unsigned long st_deny_bmap;