diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /include/linux/nfsd | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'include/linux/nfsd')
| -rw-r--r-- | include/linux/nfsd/nfsfh.h | 2 | ||||
| -rw-r--r-- | include/linux/nfsd/syscall.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h index ae88f161d..4d089f946 100644 --- a/include/linux/nfsd/nfsfh.h +++ b/include/linux/nfsd/nfsfh.h @@ -137,6 +137,7 @@ fh_put(struct svc_fh *fhp) if (fhp->fh_dverified) { fh_unlock(fhp); dput(fhp->fh_handle.fh_dentry); + fhp->fh_dverified = 0; } } #else @@ -159,6 +160,7 @@ __fh_put(struct svc_fh *fhp, char *file, int line) } else { fh_unlock(fhp); dput(dentry); + fhp->fh_dverified = 0; } } #endif diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h index 690f0095f..0bf4a5a58 100644 --- a/include/linux/nfsd/syscall.h +++ b/include/linux/nfsd/syscall.h @@ -112,8 +112,7 @@ union nfsctl_res { * Kernel syscall implementation. */ #if defined(CONFIG_NFSD) || defined(CONFIG_NFSD_MODULE) -extern asmlinkage int sys_nfsservctl(int, struct nfsctl_arg *, - union nfsctl_res *); +extern asmlinkage int sys_nfsservctl(int, void *, void *); #else #define sys_nfsservctl sys_ni_syscall #endif |