LU-5435 libcfs: copy out ioctl inline buffer

[fs/lustre-release.git] / lustre / obdclass / llog_swab.c

diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c
index 150921a..97ed7f4 100644 (file)
--- a/lustre/obdclass/llog_swab.c
+++ b/lustre/obdclass/llog_swab.c
@@ -42,9 +42,6 @@
 
 #define DEBUG_SUBSYSTEM S_LOG
 
-#ifndef __KERNEL__
-#include <liblustre.h>
-#endif
 
 #include <lustre_log.h>
 
@@ -174,28 +171,32 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec)
        }
        case CHANGELOG_REC:
        {
-                struct llog_changelog_rec *cr = (struct llog_changelog_rec*)rec;
-
-                __swab16s(&cr->cr.cr_namelen);
-                __swab16s(&cr->cr.cr_flags);
-                __swab32s(&cr->cr.cr_type);
-                __swab64s(&cr->cr.cr_index);
-                __swab64s(&cr->cr.cr_prev);
-                __swab64s(&cr->cr.cr_time);
-                lustre_swab_lu_fid(&cr->cr.cr_tfid);
-                lustre_swab_lu_fid(&cr->cr.cr_pfid);
-               if (CHANGELOG_REC_EXTENDED(&cr->cr)) {
-                       struct llog_changelog_ext_rec *ext =
-                               (struct llog_changelog_ext_rec *)rec;
-
-                       lustre_swab_lu_fid(&ext->cr.cr_sfid);
-                       lustre_swab_lu_fid(&ext->cr.cr_spfid);
-                       tail = &ext->cr_tail;
-               } else {
-                       tail = &cr->cr_tail;
+               struct llog_changelog_rec *cr =
+                       (struct llog_changelog_rec *)rec;
+
+               __swab16s(&cr->cr.cr_namelen);
+               __swab16s(&cr->cr.cr_flags);
+               __swab32s(&cr->cr.cr_type);
+               __swab64s(&cr->cr.cr_index);
+               __swab64s(&cr->cr.cr_prev);
+               __swab64s(&cr->cr.cr_time);
+               lustre_swab_lu_fid(&cr->cr.cr_tfid);
+               lustre_swab_lu_fid(&cr->cr.cr_pfid);
+               if (cr->cr.cr_flags & CLF_RENAME) {
+                       struct changelog_ext_rename *rnm =
+                               changelog_rec_rename(&cr->cr);
+
+                       lustre_swab_lu_fid(&rnm->cr_sfid);
+                       lustre_swab_lu_fid(&rnm->cr_spfid);
                }
-                break;
-        }
+               /* Because the tail follows a variable-length structure we need
+                * to compute its location at runtime */
+               tail = (struct llog_rec_tail *)((char *)&cr->cr +
+                                               changelog_rec_size(&cr->cr) +
+                                               cr->cr.cr_namelen);
+               break;
+       }
+
        case CHANGELOG_USER_REC:
        {
                 struct llog_changelog_user_rec *cur =
@@ -278,10 +279,10 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec)
                        rec->lrh_type, rec);
         }
 
-        if (tail) {
-                __swab32s(&tail->lrt_len);
-                __swab32s(&tail->lrt_index);
-        }
+       if (tail) {
+               __swab32s(&tail->lrt_len);
+               __swab32s(&tail->lrt_index);
+       }
 }
 EXPORT_SYMBOL(lustre_swab_llog_rec);