Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / include / linux / lockd / share.h

diff --git a/include/linux/lockd/share.h b/include/linux/lockd/share.h
index c75a424ebe4c81822f6e07e908068cce1f18bb36..630c5bf69b0786046bf420481e0894c56e3a4562 100644 (file)
--- a/include/linux/lockd/share.h
+++ b/include/linux/lockd/share.h
@@ -21,10 +21,11 @@ struct nlm_share {
        u32                     s_mode;         /* deny mode */
 };
 
-u32    nlmsvc_share_file(struct nlm_host *, struct nlm_file *,
+__be32 nlmsvc_share_file(struct nlm_host *, struct nlm_file *,
                                               struct nlm_args *);
-u32    nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
+__be32 nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *,
                                               struct nlm_args *);
-void   nlmsvc_traverse_shares(struct nlm_host *, struct nlm_file *, int);
+void   nlmsvc_traverse_shares(struct nlm_host *, struct nlm_file *,
+                                              nlm_host_match_fn_t);
 
 #endif /* LINUX_LOCKD_SHARE_H */