staging/lustre: Adjust import state history output format
authorOleg Drokin <green@linuxhacker.ru>
Wed, 10 Feb 2016 18:00:20 +0000 (13:00 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Feb 2016 03:29:55 +0000 (19:29 -0800)
New test scripts expect spaces around state names and square brackets
when parsing debugfs output, so add them to avoid false failures.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c

index 9a1434d89d573932741e2f9dcc2125d4fde88286..eda44d89ffebe37c366260f3656f8a9661ad5bc4 100644 (file)
@@ -642,21 +642,21 @@ int lprocfs_rd_import(struct seq_file *m, void *data)
                     "    target: %s\n"
                     "    state: %s\n"
                     "    instance: %u\n"
-                    "    connect_flags: [",
+                    "    connect_flags: [ ",
                     obd->obd_name,
                     obd2cli_tgt(obd),
                     ptlrpc_import_state_name(imp->imp_state),
                     imp->imp_connect_data.ocd_instance);
        obd_connect_seq_flags2str(m, imp->imp_connect_data.ocd_connect_flags, ", ");
        seq_printf(m,
-                     "]\n"
-                     "    import_flags: [");
+                     " ]\n"
+                     "    import_flags: [ ");
        obd_import_flags2str(imp, m);
 
        seq_printf(m,
-                     "]\n"
+                     " ]\n"
                      "    connection:\n"
-                     "       failover_nids: [");
+                     "       failover_nids: [ ");
        spin_lock(&imp->imp_lock);
        j = 0;
        list_for_each_entry(conn, &imp->imp_conn_list, oic_item) {
@@ -671,7 +671,7 @@ int lprocfs_rd_import(struct seq_file *m, void *data)
        else
                strncpy(nidstr, "<none>", sizeof(nidstr));
        seq_printf(m,
-                     "]\n"
+                     " ]\n"
                      "       current_connection: %s\n"
                      "       connection_attempts: %u\n"
                      "       generation: %u\n"
@@ -795,7 +795,7 @@ int lprocfs_rd_state(struct seq_file *m, void *data)
                        &imp->imp_state_hist[(k + j) % IMP_STATE_HIST_LEN];
                if (ish->ish_state == 0)
                        continue;
-               seq_printf(m, " - [%lld, %s]\n", (s64)ish->ish_time,
+               seq_printf(m, " - [ %lld, %s ]\n", (s64)ish->ish_time,
                           ptlrpc_import_state_name(ish->ish_state));
        }