LU-930 misc: limit CDEBUG console message frequency

[fs/lustre-release.git] / lustre / lov / lov_obd.c

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index 1d2fe34..cd3be35 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -91,7 +91,7 @@ void lov_tgts_putref(struct obd_device *obd)
                         /* XXX - right now there is a dependency on ld_tgt_count
                          * being the maximum tgt index for computing the
                          * mds_max_easize. So we can't shrink it. */
-                        lov_ost_pool_remove(&lov->lov_packed, i);
+                       tgt_pool_remove(&lov->lov_packed, i);
                         lov->lov_tgts[i] = NULL;
                         lov->lov_death_row--;
                 }
@@ -283,10 +283,6 @@ static int lov_disconnect_obd(struct obd_device *obd, struct lov_tgt_desc *tgt)
                osc_obd->obd_force = obd->obd_force;
                osc_obd->obd_fail = obd->obd_fail;
                osc_obd->obd_no_recov = obd->obd_no_recov;
-
-               if (lov->targets_proc_entry != NULL)
-                       lprocfs_remove_proc_entry(osc_obd->obd_name,
-                                                 lov->targets_proc_entry);
        }
 
        obd_register_observer(osc_obd, NULL);
@@ -542,7 +538,7 @@ static int lov_add_target(struct obd_device *obd, struct obd_uuid *uuidp,
                 RETURN(-ENOMEM);
         }
 
-        rc = lov_ost_pool_add(&lov->lov_packed, index, lov->lov_tgt_size);
+       rc = tgt_pool_add(&lov->lov_packed, index, lov->lov_tgt_size);
         if (rc) {
                mutex_unlock(&lov->lov_lock);
                 OBD_FREE_PTR(tgt);
@@ -760,7 +756,7 @@ int lov_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
        if (rc)
                GOTO(out, rc);
 
-        rc = lov_ost_pool_init(&lov->lov_packed, 0);
+       rc = tgt_pool_init(&lov->lov_packed, 0);
         if (rc)
                GOTO(out, rc);
 
@@ -797,7 +793,7 @@ static int lov_cleanup(struct obd_device *obd)
                 lov_pool_del(obd, pool->pool_name);
         }
        lov_pool_hash_destroy(&lov->lov_pools_hash_body);
-        lov_ost_pool_free(&lov->lov_packed);
+       tgt_pool_free(&lov->lov_packed);
 
        lprocfs_obd_cleanup(obd);
         if (lov->lov_tgts) {
@@ -953,7 +949,6 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
        struct obd_device *obd = class_exp2obd(exp);
        struct lov_obd *lov = &obd->u.lov;
        int i = 0, rc = 0, count = lov->desc.ld_tgt_count;
-       struct obd_uuid *uuidp;
 
        ENTRY;
        switch (cmd) {
@@ -1003,48 +998,6 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                        RETURN(-EFAULT);
                break;
         }
-       case OBD_IOC_LOV_GET_CONFIG: {
-               struct obd_ioctl_data *data = NULL;
-               struct lov_desc *desc;
-               __u32 *genp;
-
-               len = 0;
-               if (obd_ioctl_getdata(&data, &len, uarg))
-                       RETURN(-EINVAL);
-
-               if (sizeof(*desc) > data->ioc_inllen1) {
-                       OBD_FREE_LARGE(data, len);
-                       RETURN(-EINVAL);
-               }
-
-               if (sizeof(uuidp->uuid) * count > data->ioc_inllen2) {
-                       OBD_FREE_LARGE(data, len);
-                       RETURN(-EINVAL);
-               }
-
-               if (sizeof(__u32) * count > data->ioc_inllen3) {
-                       OBD_FREE_LARGE(data, len);
-                       RETURN(-EINVAL);
-               }
-
-               desc = (struct lov_desc *)data->ioc_inlbuf1;
-               memcpy(desc, &lov->desc, sizeof(*desc));
-
-               uuidp = (struct obd_uuid *)data->ioc_inlbuf2;
-               genp = (__u32 *)data->ioc_inlbuf3;
-               /* the uuid will be empty for deleted OSTs */
-               for (i = 0; i < count; i++, uuidp++, genp++) {
-                       if (!lov->lov_tgts[i])
-                               continue;
-                       *uuidp = lov->lov_tgts[i]->ltd_uuid;
-                       *genp = lov->lov_tgts[i]->ltd_gen;
-               }
-
-               if (copy_to_user(uarg, data, len))
-                       rc = -EFAULT;
-               OBD_FREE_LARGE(data, len);
-               break;
-       }
         case OBD_IOC_QUOTACTL: {
                 struct if_quotactl *qctl = karg;
                 struct lov_tgt_desc *tgt = NULL;
@@ -1114,11 +1067,11 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                                            len, karg, uarg);
                        if (err) {
                                if (lov->lov_tgts[i]->ltd_active) {
-                                       CDEBUG(err == -ENOTTY ?
-                                              D_IOCTL : D_WARNING,
-                                              "iocontrol OSC %s on OST idx %d cmd %x: err = %d\n",
-                                              lov_uuid2str(lov, i),
-                                              i, cmd, err);
+                                       CDEBUG_LIMIT(err == -ENOTTY ?
+                                                    D_IOCTL : D_WARNING,
+                                                    "iocontrol OSC %s on OST idx %d cmd %x: err = %d\n",
+                                                    lov_uuid2str(lov, i),
+                                                    i, cmd, err);
                                        if (!rc)
                                                rc = err;
                                }
@@ -1372,7 +1325,7 @@ static int __init lov_init(void)
                 return -ENOMEM;
         }
 
-       rc = class_register_type(&lov_obd_ops, NULL, true, NULL,
+       rc = class_register_type(&lov_obd_ops, NULL, true,
                                 LUSTRE_LOV_NAME, &lov_device_type);
         if (rc) {
                kmem_cache_destroy(lov_oinfo_slab);