fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / lockd / bind.h

diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
index b054deb..246de1d 100644 (file)
--- a/include/linux/lockd/bind.h
+++ b/include/linux/lockd/bind.h
@@ -10,6 +10,11 @@
 #define LINUX_LOCKD_BIND_H
 
 #include <linux/lockd/nlm.h>
+/* need xdr-encoded error codes too, so... */
+#include <linux/lockd/xdr.h>
+#ifdef CONFIG_LOCKD_V4
+#include <linux/lockd/xdr4.h>
+#endif
 
 /* Dummy declarations */
 struct svc_rqst;
@@ -18,7 +23,7 @@ struct svc_rqst;
  * This is the set of functions for lockd->nfsd communication
  */
 struct nlmsvc_binding {
-       u32                     (*fopen)(struct svc_rqst *,
+       __be32                  (*fopen)(struct svc_rqst *,
                                                struct nfs_fh *,
                                                struct file **);
        void                    (*fclose)(struct file *);
@@ -30,7 +35,7 @@ extern struct nlmsvc_binding *        nlmsvc_ops;
  * Functions exported by the lockd module
  */
 extern int     nlmclnt_proc(struct inode *, int, struct file_lock *);
-extern int     lockd_up(void);
+extern int     lockd_up(int proto);
 extern void    lockd_down(void);
 
 #endif /* LINUX_LOCKD_BIND_H */