Revert "LU-147 avoid 8k obd device amount limit"

[fs/lustre-release.git] / lustre / include / obd_class.h

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index 6427f4f..65e502f 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -76,48 +76,20 @@ int class_register_type(struct obd_ops *, struct md_ops *,
                         struct lu_device_type *ldt);
 int class_unregister_type(const char *nm);
 
-
-
-
-/**
- allocate one minor number
- */
-int obd_minor_alloc(void);
-/**
- release allocated minor
- */
-void obd_minor_release(long minor);
-/**
- return 1 if minor is point to allocated device,
- return 0 otherwise
- */
-int obd_minor_valid(long minor);
-
-int obd_hashes_init(void);
-void obd_hashes_fini(void);
-
-struct obd_device *class_newdev(const char *type_name, const char *name,
-                                const char *uuid);
+struct obd_device *class_newdev(const char *type_name, const char *name);
 void class_release_dev(struct obd_device *obd);
 
 int class_name2dev(const char *name);
 struct obd_device *class_name2obd(const char *name);
 int class_uuid2dev(struct obd_uuid *uuid);
 struct obd_device *class_uuid2obd(struct obd_uuid *uuid);
-
 void class_obd_list(void);
-void obd_devlist_first(struct obd_device **pos);
-void obd_devlist_next(struct obd_device **pos);
-void obd_devlist_last(struct obd_device *pos);
-const char *obd_dev_status(struct obd_device *obd);
-
 struct obd_device * class_find_client_obd(struct obd_uuid *tgt_uuid,
                                           const char * typ_name,
                                           struct obd_uuid *grp_uuid);
 struct obd_device * class_devices_in_group(struct obd_uuid *grp_uuid,
-                                           struct obd_device **prev);
-struct obd_device * class_num2obd(__u32 num);
-
+                                           int *next);
+struct obd_device * class_num2obd(int num);
 
 int class_notify_sptlrpc_conf(const char *fsname, int namelen);
 
@@ -496,6 +468,11 @@ do {                                                                 \
         }                                                            \
 } while (0)
 
+static inline int class_devno_max(void)
+{
+        return MAX_OBD_DEVICES;
+}
+
 static inline int obd_get_info(struct obd_export *exp, __u32 keylen,
                                void *key, __u32 *vallen, void *val,
                                struct lov_stripe_md *lsm)