Merge branch 'master' into for_mm

[linux-2.6-omap-h63xx.git] / include / linux / sunrpc / auth_gss.h

diff --git a/include/linux/sunrpc/auth_gss.h b/include/linux/sunrpc/auth_gss.h
index 97b62e97dd8d3fcaef89e0332005d97abd397c5c..fec6899bf3553f564bd148c72d54689a77a72f1a 100644 (file)
--- a/include/linux/sunrpc/auth_gss.h
+++ b/include/linux/sunrpc/auth_gss.h
@@ -75,6 +75,7 @@ struct gss_cl_ctx {
        struct xdr_netobj       gc_wire_ctx;
        u32                     gc_win;
        unsigned long           gc_expiry;
+       struct rcu_head         gc_rcu;
 };
 
 struct gss_upcall_msg;
@@ -83,15 +84,9 @@ struct gss_cred {
        enum rpc_gss_svc        gc_service;
        struct gss_cl_ctx       *gc_ctx;
        struct gss_upcall_msg   *gc_upcall;
+       unsigned char           gc_machine_cred : 1;
 };
 
-#define gc_uid                 gc_base.cr_uid
-#define gc_count               gc_base.cr_count
-#define gc_flags               gc_base.cr_flags
-#define gc_expire              gc_base.cr_expire
-
-void print_hexl(u32 *p, u_int length, u_int offset);
-
 #endif /* __KERNEL__ */
 #endif /* _LINUX_SUNRPC_AUTH_GSS_H */