- many fixes in liblustre related stuff. By now liblustre is at least build-able...

[fs/lustre-release.git] / lustre / ptlrpc / pack_generic.c

diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index 1072c8c..5fc436a 100644 (file)
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -36,8 +36,6 @@
 #include <linux/lustre_sec.h>
 #include <linux/lustre_audit.h>
 #include <linux/fcntl.h>
-#include <linux/posix_acl.h>
-
 
 #define HDR_SIZE(count) \
     size_round(offsetof (struct lustre_msg, buflens[(count)]))
@@ -919,6 +917,24 @@ void lustre_swab_remote_perm(struct mds_remote_perm *p)
         __swab16s(&p->mrp_perm);
 }
 
+void lustre_swab_lustre_capa(struct lustre_capa *c)
+{
+        __swab32s (&c->lc_uid);
+        __swab32s (&c->lc_op);
+        __swab64s (&c->lc_ino);
+        __swab32s (&c->lc_mdsid);
+        __swab32s (&c->lc_keyid);
+        __swab64s (&c->lc_expiry);
+        __swab32s (&c->lc_flags);
+}
+
+void lustre_swab_lustre_capa_key (struct lustre_capa_key *k)
+{
+        __swab32s (&k->lk_mdsid);
+        __swab32s (&k->lk_keyid);
+        __swab64s (&k->lk_expiry);
+}
+
 void lustre_swab_audit_msg (struct audit_msg *r)
 {
         lustre_swab_lustre_id(&r->id);
@@ -948,6 +964,7 @@ int llog_log_swabbed(struct llog_log_hdr *hdr)
 void lustre_assert_wire_constants(void)
 {
 }
+
 /* for gks key rec */
 void lustre_swab_key_perms(struct key_perm *kperm)
 {
@@ -962,9 +979,10 @@ void lustre_swab_key_perms(struct key_perm *kperm)
                 __swab32s(&kperm->kp_acls[i].e_id); 
         }  
 }
+
 void lustre_swab_key_context (struct key_context *kctxt)
 {
-        __swab32s (&kctxt->kc_command);
-        __swab32s (&kctxt->kc_valid); /* for use with open */
+        __swab32s(&kctxt->kc_command);
+        __swab32s(&kctxt->kc_valid); /* for use with open */
         lustre_swab_key_perms(&kctxt->kc_perm);
 }