LU-6895 lfsck: not destroy directory when fix FID-in-dirent

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

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 589b2c6..a1b9417 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -610,15 +610,15 @@ static inline void ostid_set_id(struct ost_id *oi, __u64 oid)
 {
        if (fid_seq_is_mdt0(oi->oi.oi_seq)) {
                if (oid >= IDIF_MAX_OID) {
-                       CERROR("Bad "LPU64" to set "DOSTID"\n",
-                               oid, POSTID(oi));
+                       CERROR("Bad %llu to set "DOSTID"\n",
+                               (unsigned long long)oid, POSTID(oi));
                        return;
                }
                oi->oi.oi_id = oid;
        } else if (fid_is_idif(&oi->oi_fid)) {
                if (oid >= IDIF_MAX_OID) {
-                       CERROR("Bad "LPU64" to set "DOSTID"\n",
-                               oid, POSTID(oi));
+                       CERROR("Bad %llu to set "DOSTID"\n",
+                               (unsigned long long)oid, POSTID(oi));
                        return;
                }
                oi->oi_fid.f_seq = fid_idif_seq(oid,
@@ -627,8 +627,8 @@ static inline void ostid_set_id(struct ost_id *oi, __u64 oid)
                oi->oi_fid.f_ver = oid >> 48;
        } else {
                if (oid > OBIF_MAX_OID) {
-                       CERROR("Bad "LPU64" to set "DOSTID"\n",
-                               oid, POSTID(oi));
+                       CERROR("Bad %llu to set "DOSTID"\n",
+                               (unsigned long long)oid, POSTID(oi));
                        return;
                }
                oi->oi_fid.f_oid = oid;
@@ -644,8 +644,8 @@ static inline int fid_set_id(struct lu_fid *fid, __u64 oid)
 
        if (fid_is_idif(fid)) {
                if (oid >= IDIF_MAX_OID) {
-                       CERROR("Bad "LPU64" to set "DFID"\n",
-                               oid, PFID(fid));
+                       CERROR("Bad %llu to set "DFID"\n",
+                               (unsigned long long)oid, PFID(fid));
                        return -EBADF;
                }
                fid->f_seq = fid_idif_seq(oid, fid_idif_ost_idx(fid));
@@ -653,8 +653,8 @@ static inline int fid_set_id(struct lu_fid *fid, __u64 oid)
                fid->f_ver = oid >> 48;
        } else {
                if (oid > OBIF_MAX_OID) {
-                       CERROR("Bad "LPU64" to set "DFID"\n",
-                               oid, PFID(fid));
+                       CERROR("Bad %llu to set "DFID"\n",
+                               (unsigned long long)oid, PFID(fid));
                        return -EBADF;
                }
                fid->f_oid = oid;
@@ -904,6 +904,8 @@ enum lu_dirent_attrs {
        LUDA_UPGRADE            = 0x1000,
        /* Ignore this record, go to next directly. */
        LUDA_IGNORE             = 0x0800,
+       /* Something in the record is unknown, to be verified in further. */
+       LUDA_UNKNOWN            = 0x1000,
 };
 
 #define LU_DIRENT_ATTRS_MASK   0xf800
@@ -2798,9 +2800,11 @@ struct ldlm_res_id {
         __u64 name[RES_NAME_SIZE];
 };
 
-#define DLDLMRES       "["LPX64":"LPX64":"LPX64"]."LPX64i
-#define PLDLMRES(res)  (res)->lr_name.name[0], (res)->lr_name.name[1], \
-                       (res)->lr_name.name[2], (res)->lr_name.name[3]
+#define DLDLMRES       "[%#llx:%#llx:%#llx].%#llx"
+#define PLDLMRES(res)  (unsigned long long)(res)->lr_name.name[0],     \
+                       (unsigned long long)(res)->lr_name.name[1],     \
+                       (unsigned long long)(res)->lr_name.name[2],     \
+                       (unsigned long long)(res)->lr_name.name[3]
 
 extern void lustre_swab_ldlm_res_id (struct ldlm_res_id *id);
 
@@ -3308,7 +3312,12 @@ enum llog_flag {
        LLOG_F_IS_CAT           = 0x2,
        LLOG_F_IS_PLAIN         = 0x4,
        LLOG_F_EXT_JOBID        = 0x8,
+       LLOG_F_IS_FIXSIZE       = 0x10,
 
+       /* Note: Flags covered by LLOG_F_EXT_MASK will be inherited from
+        * catlog to plain log, so do not add LLOG_F_IS_FIXSIZE here,
+        * because the catlog record is usually fixed size, but its plain
+        * log record can be variable */
        LLOG_F_EXT_MASK = LLOG_F_EXT_JOBID,
 };
 
@@ -3942,11 +3951,15 @@ struct object_update_request {
        struct object_update    ourq_updates[0];
 };
 
-#define OUT_UPDATE_HEADER_MAGIC        0xBDDF0001
+#define OUT_UPDATE_HEADER_MAGIC                0xBDDF0001
+#define OUT_UPDATE_MAX_INLINE_SIZE     4096
 /* Header for updates request between MDTs */
 struct out_update_header {
        __u32           ouh_magic;
        __u32           ouh_count;
+       __u32           ouh_inline_length;
+       __u32           ouh_padding;
+       __u32           ouh_inline_data[0];
 };
 
 struct out_update_buffer {