Backout "liblustre now builds" commit. It breaks building in utils:

[fs/lustre-release.git] / lustre / include / linux / lustre_idl.h

diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h
index b78582f..2ee7cd0 100644 (file)
--- a/lustre/include/linux/lustre_idl.h
+++ b/lustre/include/linux/lustre_idl.h
@@ -1288,6 +1288,7 @@ typedef enum {
         GKS_GET_MAC      = 704,
 } gks_cmd_t;
 
+#ifdef __KERNEL__
 #define KEY_SIZE        16 
 #define MAC_SIZE        16 
 
@@ -1297,14 +1298,6 @@ struct crypto_key {
         __u32   ck_type;
 };
 
-#ifndef __KERNEL__
-struct posix_acl_entry {
-        short           e_tag;
-        unsigned short  e_perm;
-        unsigned int    e_id;
-};
-#endif
-
 struct key_perm {
         uid_t    kp_uid;       
         gid_t    kp_gid;
@@ -1319,11 +1312,11 @@ struct key_context {
         __u32  kc_valid;
         struct key_perm kc_perm;
 }; 
-typedef int (*crypt_cb_t)(struct page *page, __u64 offset,
-                          __u64 count, int flags);
-
+typedef int (*crypt_cb_t)(struct page *page, __u64 offset, __u64 count, 
+                          int flags);
 extern void lustre_swab_key_context (struct key_context *kctxt);
 extern void lustre_swab_key_perms (struct key_perm *kperm);
+#endif /*for define __KERNEL*/
 
 extern void lustre_swab_lustre_id(struct lustre_id *id);
 extern void lustre_swab_lov_desc(struct lov_desc *desc);