lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ocfs2: Fix ocfs2_osb_dump()

Browse Source 
Skip printing information that is not valid for local mounts.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
This commit is contained in:
Sunil Mushran
2009-06-19 14:45:55 -07:00
committed by Joel Becker
parent 94e41ecfe0
commit c3d38840ab
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
fs/ocfs2/super.c
View File

@@ -234,20 +234,24 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
"%10s => Opts: 0x%lX AtimeQuanta: %u\n", "Mount", "%10s => Opts: 0x%lX AtimeQuanta: %u\n", "Mount",
osb->s_mount_opt, osb->s_atime_quantum); osb->s_mount_opt, osb->s_atime_quantum);
out += snprintf(buf + out, len - out, if (cconn) {
"%10s => Stack: %s Name: %*s Version: %d.%d\n", out += snprintf(buf + out, len - out,
"Cluster", "%10s => Stack: %s Name: %*s "
(*osb->osb_cluster_stack == '\0' ? "Version: %d.%d\n", "Cluster",
"o2cb" : osb->osb_cluster_stack), (*osb->osb_cluster_stack == '\0' ?
cconn->cc_namelen, cconn->cc_name, "o2cb" : osb->osb_cluster_stack),
cconn->cc_version.pv_major, cconn->cc_version.pv_minor); cconn->cc_namelen, cconn->cc_name,
cconn->cc_version.pv_major,
cconn->cc_version.pv_minor);
}
spin_lock(&osb->dc_task_lock); spin_lock(&osb->dc_task_lock);
out += snprintf(buf + out, len - out, out += snprintf(buf + out, len - out,
"%10s => Pid: %d Count: %lu WakeSeq: %lu " "%10s => Pid: %d Count: %lu WakeSeq: %lu "
"WorkSeq: %lu\n", "DownCnvt", "WorkSeq: %lu\n", "DownCnvt",
task_pid_nr(osb->dc_task), osb->blocked_lock_count, (osb->dc_task ? task_pid_nr(osb->dc_task) : -1),
osb->dc_wake_sequence, osb->dc_work_sequence); osb->blocked_lock_count, osb->dc_wake_sequence,
osb->dc_work_sequence);
spin_unlock(&osb->dc_task_lock); spin_unlock(&osb->dc_task_lock);
spin_lock(&osb->osb_lock); spin_lock(&osb->osb_lock);
@@ -267,14 +271,15 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
out += snprintf(buf + out, len - out, out += snprintf(buf + out, len - out,
"%10s => Pid: %d Interval: %lu Needs: %d\n", "Commit", "%10s => Pid: %d Interval: %lu Needs: %d\n", "Commit",
task_pid_nr(osb->commit_task), osb->osb_commit_interval, (osb->commit_task ? task_pid_nr(osb->commit_task) : -1),
osb->osb_commit_interval,
atomic_read(&osb->needs_checkpoint)); atomic_read(&osb->needs_checkpoint));
out += snprintf(buf + out, len - out, out += snprintf(buf + out, len - out,
"%10s => State: %d NumTxns: %d TxnId: %lu\n", "%10s => State: %d TxnId: %lu NumTxns: %d\n",
"Journal", osb->journal->j_state, "Journal", osb->journal->j_state,
atomic_read(&osb->journal->j_num_trans), osb->journal->j_trans_id,
osb->journal->j_trans_id); atomic_read(&osb->journal->j_num_trans));
out += snprintf(buf + out, len - out, out += snprintf(buf + out, len - out,
"%10s => GlobalAllocs: %d LocalAllocs: %d " "%10s => GlobalAllocs: %d LocalAllocs: %d "
@@ -302,7 +307,6 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
out += snprintf(buf + out, len - out, "%10s => %3s %10s\n", out += snprintf(buf + out, len - out, "%10s => %3s %10s\n",
"Slots", "Num", "RecoGen"); "Slots", "Num", "RecoGen");
for (i = 0; i < osb->max_slots; ++i) { for (i = 0; i < osb->max_slots; ++i) {
out += snprintf(buf + out, len - out, out += snprintf(buf + out, len - out,
"%10s %c %3d %10d\n", "%10s %c %3d %10d\n",