move process_config from device_type_ops to lu_device_ops

diff --git a/lustre/include/linux/lu_object.h b/lustre/include/linux/lu_object.h
index f5fb735..d8f2ac5 100644 (file)
--- a/lustre/include/linux/lu_object.h
+++ b/lustre/include/linux/lu_object.h
@@ -169,6 +169,10 @@ struct lu_device_operations {
         */
        int (*ldo_object_print)(struct lu_context *ctx,
                                 struct seq_file *f, const struct lu_object *o);
+
+        /* process config specific for device */
+        int  (*ldo_process_config)(struct lu_device *, struct lustre_cfg *);
+
 };
 
 /*
@@ -225,9 +229,6 @@ struct lu_device_type_operations {
 
         int  (*ldto_init)(struct lu_device_type *t);
         void (*ldto_fini)(struct lu_device_type *t);
-        /* configure device */
-        int  (*ldto_device_config)(struct lu_device *, struct lustre_cfg *);
-
 };
 
 /*

diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index aabc024..c5a1273 100644 (file)
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -374,7 +374,7 @@ obd_process_config(struct obd_device *obd, int datalen, void *data)
         ldt = obd->obd_type->typ_lu;
         d = obd->obd_lu_dev;
         if (ldt != NULL && d != NULL) {
-                rc = ldt->ldt_ops->ldto_device_config(d, (struct lustre_cfg *)data);
+                rc = d->ld_ops->ldo_process_config(d, (struct lustre_cfg *)data);
         } else {
                 OBD_CHECK_OP(obd, process_config, -EOPNOTSUPP);
                 OBD_COUNTER_INCREMENT(obd, process_config);