UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging/lustre: Adjust import state history output format 

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>
This commit is contained in:
Oleg Drokin 2016-02-10 13:00:20 -05:00 committed by Greg Kroah-Hartman
parent 01de911e14
commit f3fe3718d8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
View File

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