LU-13783 procfs: fix improper prop_ops fields

[fs/lustre-release.git] / lustre / lmv / lmv_internal.h

diff --git a/lustre/lmv/lmv_internal.h b/lustre/lmv/lmv_internal.h
index 56c389d..a1d4436 100644 (file)
--- a/lustre/lmv/lmv_internal.h
+++ b/lustre/lmv/lmv_internal.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #ifndef _LMV_INTERNAL_H_
@@ -49,7 +48,6 @@ int lmv_intent_lock(struct obd_export *exp, struct md_op_data *op_data,
 int lmv_blocking_ast(struct ldlm_lock *, struct ldlm_lock_desc *,
                     void *, int);
 int lmv_fld_lookup(struct lmv_obd *lmv, const struct lu_fid *fid, u32 *mds);
-int __lmv_fid_alloc(struct lmv_obd *lmv, struct lu_fid *fid, u32 mds);
 int lmv_fid_alloc(const struct lu_env *env, struct obd_export *exp,
                  struct lu_fid *fid, struct md_op_data *op_data);
 
@@ -67,21 +65,21 @@ int lmv_statfs_check_update(struct obd_device *obd, struct lmv_tgt_desc *tgt);
 
 static inline struct obd_device *lmv2obd_dev(struct lmv_obd *lmv)
 {
-       return container_of0(lmv, struct obd_device, u.lmv);
+       return container_of_safe(lmv, struct obd_device, u.lmv);
 }
 
 static inline struct lu_tgt_desc *
 lmv_tgt(struct lmv_obd *lmv, __u32 index)
 {
-       return index < lmv->lmv_mdt_descs.ltd_tgt_bitmap->size ?
+       return index < lmv->lmv_mdt_descs.ltd_tgts_size ?
                LTD_TGT(&lmv->lmv_mdt_descs, index) : NULL;
 }
 
 static inline bool
 lmv_mdt0_inited(struct lmv_obd *lmv)
 {
-       return lmv->lmv_mdt_descs.ltd_tgt_bitmap->size > 0 &&
-              cfs_bitmap_check(lmv->lmv_mdt_descs.ltd_tgt_bitmap, 0);
+       return lmv->lmv_mdt_descs.ltd_tgts_size > 0 &&
+              test_bit(0, lmv->lmv_mdt_descs.ltd_tgt_bitmap);
 }
 
 #define lmv_foreach_tgt(lmv, tgt) ltd_foreach_tgt(&(lmv)->lmv_mdt_descs, tgt)
@@ -122,7 +120,7 @@ lmv_fid2tgt_index(struct lmv_obd *lmv, const struct lu_fid *fid)
        u32 mdt_idx;
        int rc;
 
-       if (lmv->desc.ld_tgt_count < 2)
+       if (lmv->lmv_mdt_count < 2)
                return 0;
 
        rc = lmv_fld_lookup(lmv, fid, &mdt_idx);
@@ -157,41 +155,20 @@ static inline int lmv_stripe_md_size(int stripe_count)
 /* for file under migrating directory, return the target stripe info */
 static inline const struct lmv_oinfo *
 lsm_name_to_stripe_info(const struct lmv_stripe_md *lsm, const char *name,
-                       int namelen, bool post_migrate)
+                       int namelen, bool new_layout)
 {
-       __u32 hash_type = lsm->lsm_md_hash_type;
-       __u32 stripe_count = lsm->lsm_md_stripe_count;
        int stripe_index;
 
        LASSERT(lmv_dir_striped(lsm));
 
-       if (hash_type & LMV_HASH_FLAG_MIGRATION) {
-               if (post_migrate) {
-                       hash_type &= ~LMV_HASH_FLAG_MIGRATION;
-                       stripe_count = lsm->lsm_md_migrate_offset;
-               } else {
-                       hash_type = lsm->lsm_md_migrate_hash;
-                       stripe_count -= lsm->lsm_md_migrate_offset;
-               }
-       }
-
-       stripe_index = lmv_name_to_stripe_index(hash_type, stripe_count,
-                                               name, namelen);
+       stripe_index = __lmv_name_to_stripe_index(lsm->lsm_md_hash_type,
+                                                 lsm->lsm_md_stripe_count,
+                                                 lsm->lsm_md_migrate_hash,
+                                                 lsm->lsm_md_migrate_offset,
+                                                 name, namelen, new_layout);
        if (stripe_index < 0)
                return ERR_PTR(stripe_index);
 
-       if ((lsm->lsm_md_hash_type & LMV_HASH_FLAG_MIGRATION) && !post_migrate)
-               stripe_index += lsm->lsm_md_migrate_offset;
-
-       if (stripe_index >= lsm->lsm_md_stripe_count) {
-               CERROR("stripe_index %d stripe_count %d hash_type %#x "
-                       "migrate_offset %d migrate_hash %#x name %.*s\n",
-                       stripe_index, lsm->lsm_md_stripe_count,
-                       lsm->lsm_md_hash_type, lsm->lsm_md_migrate_offset,
-                       lsm->lsm_md_migrate_hash, namelen, name);
-               return ERR_PTR(-EBADF);
-       }
-
        return &lsm->lsm_md_oinfo[stripe_index];
 }
 
@@ -202,8 +179,8 @@ static inline bool lmv_dir_retry_check_update(struct md_op_data *op_data)
        if (!lsm)
                return false;
 
-       if (lmv_dir_migrating(lsm) && !op_data->op_post_migrate) {
-               op_data->op_post_migrate = true;
+       if (lmv_dir_layout_changing(lsm) && !op_data->op_new_layout) {
+               op_data->op_new_layout = true;
                return true;
        }
 
@@ -218,12 +195,8 @@ static inline bool lmv_dir_retry_check_update(struct md_op_data *op_data)
 
 struct lmv_tgt_desc *lmv_locate_tgt(struct lmv_obd *lmv,
                                    struct md_op_data *op_data);
-
-/* lmv_qos.c */
-struct lu_tgt_desc *lmv_locate_tgt_qos(struct lmv_obd *lmv, __u32 *mdt);
-struct lu_tgt_desc *lmv_locate_tgt_rr(struct lmv_obd *lmv, __u32 *mdt);
+int lmv_old_layout_lookup(struct lmv_obd *lmv, struct md_op_data *op_data);
 
 /* lproc_lmv.c */
 int lmv_tunables_init(struct obd_device *obd);
-
 #endif