Merge branch 'audit.b32' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[linux-2.6] / include / linux / lockd / sm_inter.h

diff --git a/include/linux/lockd/sm_inter.h b/include/linux/lockd/sm_inter.h
index d93b074668ce370cd7c184448895f895e44ae734..fc61d40964dadfa24a585273fe1b660c31717f38 100644 (file)
--- a/include/linux/lockd/sm_inter.h
+++ b/include/linux/lockd/sm_inter.h
@@ -28,6 +28,8 @@ struct nsm_args {
        u32             prog;           /* RPC callback info */
        u32             vers;
        u32             proc;
+
+       char *          mon_name;
 };
 
 /*
@@ -40,6 +42,6 @@ struct nsm_res {
 
 int            nsm_monitor(struct nlm_host *);
 int            nsm_unmonitor(struct nlm_host *);
-extern u32     nsm_local_state;
+extern int     nsm_local_state;
 
 #endif /* LINUX_LOCKD_SM_INTER_H */