diff options
| author | Neil Brown <neilb@cse.unsw.edu.au> | 2004-08-22 23:02:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-22 23:02:07 -0700 |
| commit | 2b9b6f10f252c095dd047c26a3bdec599588d42a (patch) | |
| tree | b59d026eb67ef7b5d8416efaf3b7fa84bfb53bad /include/linux/lockd | |
| parent | 08dd6c30a33d5313d0fe97af1c276e1aa5cd28ca (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/lockd')
| -rw-r--r-- | include/linux/lockd/bind.h | 2 | ||||
| -rw-r--r-- | include/linux/lockd/lockd.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h index 2a03cf135e1f..b054debef2e0 100644 --- a/include/linux/lockd/bind.h +++ b/include/linux/lockd/bind.h @@ -20,7 +20,7 @@ struct svc_rqst; struct nlmsvc_binding { u32 (*fopen)(struct svc_rqst *, struct nfs_fh *, - struct file *); + struct file **); void (*fclose)(struct file *); }; diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index e0db6e1d057e..3d984af64138 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h @@ -77,7 +77,7 @@ struct nlm_rqst { struct nlm_file { struct nlm_file * f_next; /* linked list */ struct nfs_fh f_handle; /* NFS file handle */ - struct file f_file; /* VFS file pointer */ + struct file * f_file; /* VFS file pointer */ struct nlm_share * f_shares; /* DOS shares */ struct nlm_block * f_blocks; /* blocked locks */ unsigned int f_locks; /* guesstimate # of locks */ @@ -180,7 +180,7 @@ void nlmsvc_invalidate_all(void); static __inline__ struct inode * nlmsvc_file_inode(struct nlm_file *file) { - return file->f_file.f_dentry->d_inode; + return file->f_file->f_dentry->d_inode; } /* |