LU-3126 osd: remove fld lookup during configuration

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

diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h
index efe0313..7022073 100644 (file)
--- a/lustre/osd-ldiskfs/osd_internal.h
+++ b/lustre/osd-ldiskfs/osd_internal.h
@@ -239,11 +239,12 @@ struct osd_device {
          * Fid Capability
          */
        unsigned int              od_fl_capa:1,
-                                 od_is_md:1, /* set in ->ldo_prepare */
+                                 od_maybe_new:1,
                                  od_noscrub:1,
                                  od_dirent_journal:1,
-                                 od_handle_nolma:1,
-                                 od_igif_inoi:1;
+                                 od_igif_inoi:1,
+                                 od_check_ff:1,
+                                 od_is_ost:1;
 
         unsigned long             od_capa_timeout;
         __u32                     od_capa_alg;
@@ -595,7 +596,10 @@ struct osd_thread_info {
        bool                    oti_rollback;
 
        char                    oti_name[48];
-       struct filter_fid_old   oti_ff;
+       union {
+               struct filter_fid_old   oti_ff;
+               struct filter_fid       oti_ff_new;
+       };
 };
 
 extern int ldiskfs_pdo;
@@ -680,7 +684,7 @@ int osd_oii_lookup(struct osd_device *dev, const struct lu_fid *fid,
 int osd_scrub_dump(struct osd_device *dev, char *buf, int len);
 
 int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd,
-                  const struct lu_fid *fid, struct lu_seq_range *range);
+                  obd_seq seq, struct lu_seq_range *range);
 
 int osd_delete_from_remote_parent(const struct lu_env *env,
                                  struct osd_device *osd,
@@ -693,6 +697,8 @@ int osd_lookup_in_remote_parent(struct osd_thread_info *oti,
                                const struct lu_fid *fid,
                                struct osd_inode_id *id);
 
+int osd_ost_seq_exists(struct osd_thread_info *info, struct osd_device *osd,
+                      __u64 seq);
 /* osd_quota_fmt.c */
 int walk_tree_dqentry(const struct lu_env *env, struct osd_object *obj,
                       int type, uint blk, int depth, uint index,
@@ -838,7 +844,6 @@ static inline char *osd_name(struct osd_device *osd)
        return osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name;
 }
 
-
 extern const struct dt_body_operations osd_body_ops;
 extern struct lu_context_key osd_key;