LU-9859 lod: use linux kernel bitmap API

[fs/lustre-release.git] / lustre / lod / lod_dev.c

diff --git a/lustre/lod/lod_dev.c b/lustre/lod/lod_dev.c
index 5091b7a..c8ec185 100644 (file)
--- a/lustre/lod/lod_dev.c
+++ b/lustre/lod/lod_dev.c
@@ -1396,7 +1396,7 @@ static int lod_statfs(const struct lu_env *env, struct dt_device *dev,
                        (int)sfs->os_bsize, (int)ost_sfs.os_bsize);
        }
        lod_putref(lod, &lod->lod_ost_descs);
-       sfs->os_state |= OS_STATE_SUM;
+       sfs->os_state |= OS_STATFS_SUM;
 
        /* If we have _some_ OSTs, but don't have as many free objects on the
         * OSTs as inodes on the MDTs, reduce the reported number of inodes
@@ -1841,10 +1841,9 @@ static struct lu_device *lod_device_free(const struct lu_env *env,
 
        ENTRY;
 
-       if (atomic_read(&lu->ld_ref) > 0 &&
-           !cfs_hash_is_empty(lu->ld_site->ls_obj_hash)) {
-               LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_ERROR, NULL);
-               lu_site_print(env, lu->ld_site, &msgdata, lu_cdebug_printer);
+       if (atomic_read(&lu->ld_site->ls_obj_hash.nelems)) {
+               lu_site_print(env, lu->ld_site, &lu->ld_ref, D_ERROR,
+                             lu_cdebug_printer);
        }
        LASSERTF(atomic_read(&lu->ld_ref) == 0, "lu is %p\n", lu);
        dt_device_fini(&lod->lod_dt_dev);
@@ -1887,10 +1886,9 @@ static struct lu_device *lod_device_alloc(const struct lu_env *env,
 static void lod_avoid_guide_fini(struct lod_avoid_guide *lag)
 {
        if (lag->lag_oss_avoid_array)
-               OBD_FREE(lag->lag_oss_avoid_array,
-                        sizeof(u32) * lag->lag_oaa_size);
-       if (lag->lag_ost_avoid_bitmap)
-               CFS_FREE_BITMAP(lag->lag_ost_avoid_bitmap);
+               OBD_FREE_PTR_ARRAY(lag->lag_oss_avoid_array,
+                                  lag->lag_oaa_size);
+       bitmap_free(lag->lag_ost_avoid_bitmap);
 }
 
 /**
@@ -2037,8 +2035,8 @@ static void lod_key_fini(const struct lu_context *ctx,
                lod_free_def_comp_entries(&info->lti_def_striping);
 
        if (info->lti_comp_size > 0)
-               OBD_FREE(info->lti_comp_idx,
-                        info->lti_comp_size * sizeof(u32));
+               OBD_FREE_PTR_ARRAY(info->lti_comp_idx,
+                                  info->lti_comp_size);
 
        lod_avoid_guide_fini(&info->lti_avoid);