LU-11625 ofd: handle upgraded filter_fid properly

[fs/lustre-release.git] / lustre / lod / lod_internal.h

diff --git a/lustre/lod/lod_internal.h b/lustre/lod/lod_internal.h
index e987ca6..a240b72 100644 (file)
--- a/lustre/lod/lod_internal.h
+++ b/lustre/lod/lod_internal.h
@@ -254,6 +254,7 @@ struct lod_layout_component {
        __u16                     llc_stripe_offset;
        __u16                     llc_stripe_count;
        __u16                     llc_stripes_allocated;
+       __u64                     llc_timestamp; /* snapshot time */
        char                     *llc_pool;
        /* ost list specified with LOV_USER_MAGIC_SPECIFIC lum */
        struct ost_pool           llc_ostlist;
@@ -317,6 +318,8 @@ struct lod_object {
                        __u16           ldo_dir_stripes_allocated;
                        __u32           ldo_dir_stripe_offset;
                        __u32           ldo_dir_hash_type;
+                       __u32           ldo_dir_migrate_offset;
+                       __u32           ldo_dir_migrate_hash;
                        /* Is a slave stripe of striped directory? */
                        __u32           ldo_dir_slave_stripe:1,
                                        ldo_dir_striped:1,
@@ -424,7 +427,6 @@ struct lod_thread_info {
        struct lu_attr                  lti_attr;
        struct lod_it                   lti_it;
        struct ldlm_res_id              lti_res_id;
-       struct ost_pool                 lti_inuse_osts;
        /* used to hold lu_dirent, sizeof(struct lu_dirent) + NAME_MAX */
        char                            lti_key[sizeof(struct lu_dirent) +
                                                NAME_MAX];
@@ -437,7 +439,7 @@ struct lod_thread_info {
        struct lustre_cfg               lti_lustre_cfg;
        /* used to store parent default striping in create */
        struct lod_default_striping     lti_def_striping;
-       struct filter_fid lti_ff;
+       struct filter_fid               lti_ff;
        __u32                           *lti_comp_idx;
        size_t                          lti_comp_size;
        size_t                          lti_count;
@@ -701,18 +703,22 @@ typedef int (*lod_obj_stripe_cb_t)(const struct lu_env *env,
 typedef bool (*lod_obj_comp_skip_cb_t)(const struct lu_env *env,
                                        struct lod_object *lo, int comp_idx,
                                        struct lod_obj_stripe_cb_data *data);
+typedef int (*lod_obj_comp_cb_t)(const struct lu_env *env,
+                               struct lod_object *lo, int comp_idx,
+                               struct lod_obj_stripe_cb_data *data);
 struct lod_obj_stripe_cb_data {
        union {
                const struct lu_attr    *locd_attr;
-               struct ost_pool         *locd_inuse;
+               int                     locd_ost_index;
+               const struct lu_buf     *locd_buf;
        };
        lod_obj_stripe_cb_t             locd_stripe_cb;
        lod_obj_comp_skip_cb_t          locd_comp_skip_cb;
+       lod_obj_comp_cb_t               locd_comp_cb;
        bool                            locd_declare;
 };
 
 /* lod_qos.c */
-int lod_prepare_inuse(const struct lu_env *env, struct lod_object *lo);
 int lod_prepare_create(const struct lu_env *env, struct lod_object *lo,
                       struct lu_attr *attr, const struct lu_buf *buf,
                       struct thandle *th);
@@ -721,15 +727,11 @@ int qos_del_tgt(struct lod_device *, struct lod_tgt_desc *);
 void lod_qos_rr_init(struct lod_qos_rr *lqr);
 int lod_use_defined_striping(const struct lu_env *, struct lod_object *,
                             const struct lu_buf *);
-int lod_obj_stripe_set_inuse_cb(const struct lu_env *env, struct lod_object *lo,
-                               struct dt_object *dt, struct thandle *th,
-                               int comp_idx, int stripe_idx,
-                               struct lod_obj_stripe_cb_data *data);
 int lod_qos_parse_config(const struct lu_env *env, struct lod_object *lo,
                         const struct lu_buf *buf);
 int lod_qos_prep_create(const struct lu_env *env, struct lod_object *lo,
                        struct lu_attr *attr, struct thandle *th,
-                       int comp_idx, struct ost_pool *inuse);
+                       int comp_idx);
 __u16 lod_comp_entry_stripe_count(struct lod_object *lo,
                                  struct lod_layout_component *entry,
                                  bool is_dir);
@@ -759,6 +761,8 @@ void lod_striping_free(const struct lu_env *env, struct lod_object *lo);
 int lod_obj_for_each_stripe(const struct lu_env *env, struct lod_object *lo,
                            struct thandle *th,
                            struct lod_obj_stripe_cb_data *data);
+int lod_comp_copy_ost_lists(struct lod_layout_component *lod_comp,
+                           struct lov_user_md_v3 *v3);
 
 /* lod_sub_object.c */
 struct thandle *lod_sub_get_thandle(const struct lu_env *env,
@@ -789,7 +793,7 @@ int lod_sub_declare_insert(const struct lu_env *env, struct dt_object *dt,
                           struct thandle *th);
 int lod_sub_insert(const struct lu_env *env, struct dt_object *dt,
                   const struct dt_rec *rec, const struct dt_key *key,
-                  struct thandle *th, int ign);
+                  struct thandle *th);
 int lod_sub_declare_delete(const struct lu_env *env, struct dt_object *dt,
                           const struct dt_key *key, struct thandle *th);
 int lod_sub_delete(const struct lu_env *env, struct dt_object *dt,
@@ -813,7 +817,7 @@ int lod_sub_declare_write(const struct lu_env *env, struct dt_object *dt,
                          struct thandle *th);
 ssize_t lod_sub_write(const struct lu_env *env, struct dt_object *dt,
                      const struct lu_buf *buf, loff_t *pos,
-                     struct thandle *th, int rq);
+                     struct thandle *th);
 int lod_sub_declare_punch(const struct lu_env *env, struct dt_object *dt,
                          __u64 start, __u64 end, struct thandle *th);
 int lod_sub_punch(const struct lu_env *env, struct dt_object *dt,