LU-13124 scrub: check for multiple linked file

[fs/lustre-release.git] / lustre / osd-zfs / osd_internal.h

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index 498756a..9fb947b 100644 (file)
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/osd-zfs/osd_internal.h
  * Shared definitions and declarations for zfs/dmu osd
@@ -128,6 +127,23 @@ enum osd_zap_pos {
        OZI_POS_REAL = 3,       /* cursor at real entries */
 };
 
+/*
+ * regular ZFS direntry
+ */
+struct zpl_direntry {
+       uint64_t        zde_dnode:48,
+                       zde_pad:12,
+                       zde_type:4;
+} __attribute__((packed));
+
+/*
+ * lustre direntry adds a fid to regular ZFS direntry
+ */
+struct luz_direntry {
+       struct zpl_direntry     lzd_reg;
+       struct lu_fid           lzd_fid;
+} __attribute__((packed));
+
 /**
  * Iterator's in-memory data structure for ZAPs
  *
@@ -140,7 +156,9 @@ struct osd_zap_it {
        struct osd_object       *ozi_obj;
        unsigned                 ozi_reset:1;   /* 1 -- no need to advance */
        /* ozi_pos - position of the cursor */
-       enum osd_zap_pos        ozi_pos;
+       enum osd_zap_pos         ozi_pos;
+       struct luz_direntry      ozi_zde;
+       zap_attribute_t          ozi_za;
        union {
                char             ozi_name[MAXNAMELEN]; /* file name for dir */
                __u64            ozi_key; /* binary key for index files */
@@ -148,24 +166,6 @@ struct osd_zap_it {
 };
 #define DT_IT2DT(it) (&((struct osd_zap_it *)it)->ozi_obj->oo_dt)
 
-/*
- * regular ZFS direntry
- */
-struct zpl_direntry {
-       uint64_t        zde_dnode:48,
-                       zde_pad:12,
-                       zde_type:4;
-} __attribute__((packed));
-
-/*
- * lustre direntry adds a fid to regular ZFS direntry
- */
-struct luz_direntry {
-       struct zpl_direntry     lzd_reg;
-       struct lu_fid           lzd_fid;
-} __attribute__((packed));
-
-
 /* cached SA attributes */
 struct osa_attr {
        uint64_t        mode;
@@ -268,6 +268,9 @@ struct osd_thread_info {
        struct lu_buf          oti_xattr_lbuf;
        zap_cursor_t           oti_zc;
        zap_cursor_t           oti_zc2;
+
+       char                    *oti_seq_name;
+       char                    *oti_dir_name;
 };
 
 extern struct lu_context_key osd_key;