diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-11-24 21:54:37 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-11-24 21:54:37 +0300 |
| commit | 3e1d7a6219ab64e13b10b1a77c0625db9a8bd8db (patch) | |
| tree | c682da7317845d7b1336e3d8498cf83bdf8f5900 /include/linux/lockd/bind.h | |
| parent | 42569c39917a08e8de1e8b5685463be7b74baebd (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
| download | linux-3e1d7a6219ab64e13b10b1a77c0625db9a8bd8db.tar.xz | |
Merge branch 'linus' into core/futexes
Diffstat (limited to 'include/linux/lockd/bind.h')
| -rw-r--r-- | include/linux/lockd/bind.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h index 3d25bcd139d1..e5872dc994c0 100644 --- a/include/linux/lockd/bind.h +++ b/include/linux/lockd/bind.h @@ -27,7 +27,6 @@ struct nlmsvc_binding { struct nfs_fh *, struct file **); void (*fclose)(struct file *); - unsigned long (*get_grace_period)(void); }; extern struct nlmsvc_binding * nlmsvc_ops; @@ -53,15 +52,7 @@ extern void nlmclnt_done(struct nlm_host *host); extern int nlmclnt_proc(struct nlm_host *host, int cmd, struct file_lock *fl); -extern int lockd_up(int proto); +extern int lockd_up(void); extern void lockd_down(void); -unsigned long get_nfs_grace_period(void); - -#ifdef CONFIG_NFSD_V4 -unsigned long get_nfs4_grace_period(void); -#else -static inline unsigned long get_nfs4_grace_period(void) {return 0;} -#endif - #endif /* LINUX_LOCKD_BIND_H */ |