b=18030 dealock fix

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

diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c
index efe5858..70a53d2 100644 (file)
--- a/lustre/obdclass/llog_swab.c
+++ b/lustre/obdclass/llog_swab.c
@@ -101,19 +101,12 @@ EXPORT_SYMBOL(lustre_swab_ll_fid);
 
 void lustre_swab_lu_fid(struct lu_fid *fid)
 {
-        __swab64s (&fid->f_seq);
-        __swab32s (&fid->f_oid);
-        __swab32s (&fid->f_ver);
+        __swab64s(&fid->f_seq);
+        __swab32s(&fid->f_oid);
+        __swab32s(&fid->f_ver);
 }
 EXPORT_SYMBOL(lustre_swab_lu_fid);
 
-void lustre_swab_lu_range(struct lu_range *range)
-{
-        __swab64s (&range->lr_start);
-        __swab64s (&range->lr_end);
-}
-EXPORT_SYMBOL(lustre_swab_lu_range);
-
 void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
 {
         __swab32s(&rec->lrh_len);
@@ -126,7 +119,7 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
                         (struct llog_size_change_rec *)rec;
 
                 lustre_swab_ll_fid(&lsc->lsc_fid);
-                __swab32s(&lsc->lsc_ioepoch);
+                __swab32s(&lsc->lsc_io_epoch);
 
                 break;
         }
@@ -138,8 +131,8 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
                 struct llog_unlink_rec *lur = (struct llog_unlink_rec *)rec;
 
                 __swab64s(&lur->lur_oid);
-                __swab32s(&lur->lur_ogen);
-
+                __swab32s(&lur->lur_ogr);
+                __swab32s(&lur->lur_count);
                 break;
         }
 
@@ -147,7 +140,18 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
                 struct llog_setattr_rec *lsr = (struct llog_setattr_rec *)rec;
 
                 __swab64s(&lsr->lsr_oid);
-                __swab32s(&lsr->lsr_ogen);
+                __swab32s(&lsr->lsr_ogr);
+                __swab32s(&lsr->lsr_uid);
+                __swab32s(&lsr->lsr_gid);
+
+                break;
+        }
+
+        case MDS_SETATTR64_REC: {
+                struct llog_setattr64_rec *lsr = (struct llog_setattr64_rec *)rec;
+
+                __swab64s(&lsr->lsr_oid);
+                __swab32s(&lsr->lsr_ogr);
                 __swab32s(&lsr->lsr_uid);
                 __swab32s(&lsr->lsr_gid);
 
@@ -184,7 +188,7 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
                 __swab32s(&lid->lid_id.lgl_ogen);
                 break;
         }
-
+        case LLOG_JOIN_REC:
         case LLOG_PAD_MAGIC:
         /* ignore old pad records of type 0 */
         case 0:
@@ -280,3 +284,67 @@ void lustre_swab_lustre_cfg(struct lustre_cfg *lcfg)
         return;
 }
 EXPORT_SYMBOL(lustre_swab_lustre_cfg);
+
+/* used only for compatibility with old on-disk cfg_marker data */
+struct cfg_marker32 {
+        __u32   cm_step;
+        __u32   cm_flags;
+        __u32   cm_vers;
+        __u32   padding;
+        __u32   cm_createtime;
+        __u32   cm_canceltime;
+        char    cm_tgtname[MTI_NAME_MAXLEN];
+        char    cm_comment[MTI_NAME_MAXLEN];
+};
+
+#define MTI_NAMELEN32    (MTI_NAME_MAXLEN - \
+        (sizeof(struct cfg_marker) - sizeof(struct cfg_marker32)))
+
+void lustre_swab_cfg_marker(struct cfg_marker *marker, int swab, int size)
+{
+        struct cfg_marker32 *cm32 = (struct cfg_marker32*)marker;
+        ENTRY;
+
+        if (swab) {
+                __swab32s(&marker->cm_step);
+                __swab32s(&marker->cm_flags);
+                __swab32s(&marker->cm_vers);
+        }
+        if (size == sizeof(*cm32)) {
+                __u32 createtime, canceltime;
+                /* There was a problem with the original declaration of
+                 * cfg_marker on 32-bit systems because it used time_t as
+                 * a wire protocol structure, and didn't verify this in
+                 * wirecheck.  We now have to convert the offsets of the
+                 * later fields in order to work on 32- and 64-bit systems.
+                 *
+                 * Fortunately, the cm_comment field has no functional use
+                 * so can be sacrificed when converting the timestamp size.
+                 *
+                 * Overwrite fields from the end first, so they are not
+                 * clobbered, and use memmove() instead of memcpy() because
+                 * the source and target buffers overlap.  bug 16771 */
+                createtime = cm32->cm_createtime;
+                canceltime = cm32->cm_canceltime;
+                memmove(marker->cm_comment, cm32->cm_comment, MTI_NAMELEN32);
+                marker->cm_comment[MTI_NAMELEN32 - 1] = '\0';
+                memmove(marker->cm_tgtname, cm32->cm_tgtname,
+                        sizeof(marker->cm_tgtname));
+                if (swab) {
+                        __swab32s(&createtime);
+                        __swab32s(&canceltime);
+                }
+                marker->cm_createtime = createtime;
+                marker->cm_canceltime = canceltime;
+                CDEBUG(D_CONFIG, "Find old cfg_marker(Srv32b,Clt64b) "
+                       "for target %s, converting\n",
+                       marker->cm_tgtname);
+        } else if (swab) {
+                __swab64s(&marker->cm_createtime);
+                __swab64s(&marker->cm_canceltime);
+        }
+
+        EXIT;
+        return;
+}
+EXPORT_SYMBOL(lustre_swab_cfg_marker);