LU-8066 obd: embed typ_kobj in obd_type

[fs/lustre-release.git] / lustre / obdclass / lprocfs_status.c

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index 34a0192..6c5d61f 100644 (file)
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -776,13 +776,17 @@ static const char *obd_connect_names[] = {
        "file_secctx",  /* 0x01 */
        "lockaheadv2",  /* 0x02 */
        "dir_migrate",  /* 0x04 */
-       "unknown",      /* 0x08 */
-       "unknown",      /* 0x10 */
+       "sum_statfs",   /* 0x08 */
+       "overstriping", /* 0x10 */
        "flr",          /* 0x20 */
        "wbc",          /* 0x40 */
        "lock_convert",  /* 0x80 */
        "archive_id_array",     /* 0x100 */
-       "selinux_policy",       /* 0x200 */
+       "unknown",              /* 0x200 */
+       "selinux_policy",       /* 0x400 */
+       "lsom",                 /* 0x800 */
+       "pcc",                  /* 0x1000 */
+       "plain_layout",         /* 0x2000 */
        NULL
 };
 
@@ -1200,7 +1204,7 @@ int lprocfs_obd_setup(struct obd_device *obd, bool uuid_only)
        obd->obd_ktype.sysfs_ops = &lustre_sysfs_ops;
        obd->obd_ktype.release = obd_sysfs_release;
 
-       obd->obd_kset.kobj.parent = obd->obd_type->typ_kobj;
+       obd->obd_kset.kobj.parent = &obd->obd_type->typ_kobj;
        obd->obd_kset.kobj.ktype = &obd->obd_ktype;
        init_completion(&obd->obd_kobj_unregister);
        rc = kset_register(&obd->obd_kset);
@@ -2363,7 +2367,7 @@ ssize_t short_io_bytes_show(struct kobject *kobj, struct attribute *attr,
 EXPORT_SYMBOL(short_io_bytes_show);
 
 /* Used to catch people who think they're specifying pages. */
-#define MIN_SHORT_IO_BYTES 64
+#define MIN_SHORT_IO_BYTES 64U
 
 ssize_t short_io_bytes_store(struct kobject *kobj, struct attribute *attr,
                             const char *buffer, size_t count)