diff options
author | Boaz Harrosh <bharrosh@panasas.com> | 2009-05-24 13:01:26 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-10 09:54:10 -0400 |
commit | de6b20385b1c14f97ccdf7da173b4c9a7405083b (patch) | |
tree | b242e4dfeb1bc1aa6c8e0fa699d04b5a3c544389 /drivers/scsi | |
parent | 29191b92030bc97b05b539ce5ae0543c24a6d7ca (diff) |
[SCSI] libosd: Better printout of OSD target system information
Shorten out the Attributes names.
Align all results on column 24.
Print system ID in a new line.
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/osd/osd_initiator.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c index 1ce6b24abab2..15f0bbc19c9c 100644 --- a/drivers/scsi/osd/osd_initiator.c +++ b/drivers/scsi/osd/osd_initiator.c | |||
@@ -118,39 +118,39 @@ static int _osd_print_system_info(struct osd_dev *od, void *caps) | |||
118 | _osd_ver_desc(or)); | 118 | _osd_ver_desc(or)); |
119 | 119 | ||
120 | pFirst = get_attrs[a++].val_ptr; | 120 | pFirst = get_attrs[a++].val_ptr; |
121 | OSD_INFO("OSD_ATTR_RI_VENDOR_IDENTIFICATION [%s]\n", | 121 | OSD_INFO("VENDOR_IDENTIFICATION [%s]\n", |
122 | (char *)pFirst); | 122 | (char *)pFirst); |
123 | 123 | ||
124 | pFirst = get_attrs[a++].val_ptr; | 124 | pFirst = get_attrs[a++].val_ptr; |
125 | OSD_INFO("OSD_ATTR_RI_PRODUCT_IDENTIFICATION [%s]\n", | 125 | OSD_INFO("PRODUCT_IDENTIFICATION [%s]\n", |
126 | (char *)pFirst); | 126 | (char *)pFirst); |
127 | 127 | ||
128 | pFirst = get_attrs[a++].val_ptr; | 128 | pFirst = get_attrs[a++].val_ptr; |
129 | OSD_INFO("OSD_ATTR_RI_PRODUCT_MODEL [%s]\n", | 129 | OSD_INFO("PRODUCT_MODEL [%s]\n", |
130 | (char *)pFirst); | 130 | (char *)pFirst); |
131 | 131 | ||
132 | pFirst = get_attrs[a++].val_ptr; | 132 | pFirst = get_attrs[a++].val_ptr; |
133 | OSD_INFO("OSD_ATTR_RI_PRODUCT_REVISION_LEVEL [%u]\n", | 133 | OSD_INFO("PRODUCT_REVISION_LEVEL [%u]\n", |
134 | pFirst ? get_unaligned_be32(pFirst) : ~0U); | 134 | pFirst ? get_unaligned_be32(pFirst) : ~0U); |
135 | 135 | ||
136 | pFirst = get_attrs[a++].val_ptr; | 136 | pFirst = get_attrs[a++].val_ptr; |
137 | OSD_INFO("OSD_ATTR_RI_PRODUCT_SERIAL_NUMBER [%s]\n", | 137 | OSD_INFO("PRODUCT_SERIAL_NUMBER [%s]\n", |
138 | (char *)pFirst); | 138 | (char *)pFirst); |
139 | 139 | ||
140 | pFirst = get_attrs[a].val_ptr; | 140 | pFirst = get_attrs[a].val_ptr; |
141 | OSD_INFO("OSD_ATTR_RI_OSD_NAME [%s]\n", (char *)pFirst); | 141 | OSD_INFO("OSD_NAME [%s]\n", (char *)pFirst); |
142 | a++; | 142 | a++; |
143 | 143 | ||
144 | pFirst = get_attrs[a++].val_ptr; | 144 | pFirst = get_attrs[a++].val_ptr; |
145 | OSD_INFO("OSD_ATTR_RI_TOTAL_CAPACITY [0x%llx]\n", | 145 | OSD_INFO("TOTAL_CAPACITY [0x%llx]\n", |
146 | pFirst ? _LLU(get_unaligned_be64(pFirst)) : ~0ULL); | 146 | pFirst ? _LLU(get_unaligned_be64(pFirst)) : ~0ULL); |
147 | 147 | ||
148 | pFirst = get_attrs[a++].val_ptr; | 148 | pFirst = get_attrs[a++].val_ptr; |
149 | OSD_INFO("OSD_ATTR_RI_USED_CAPACITY [0x%llx]\n", | 149 | OSD_INFO("USED_CAPACITY [0x%llx]\n", |
150 | pFirst ? _LLU(get_unaligned_be64(pFirst)) : ~0ULL); | 150 | pFirst ? _LLU(get_unaligned_be64(pFirst)) : ~0ULL); |
151 | 151 | ||
152 | pFirst = get_attrs[a++].val_ptr; | 152 | pFirst = get_attrs[a++].val_ptr; |
153 | OSD_INFO("OSD_ATTR_RI_NUMBER_OF_PARTITIONS [%llu]\n", | 153 | OSD_INFO("NUMBER_OF_PARTITIONS [%llu]\n", |
154 | pFirst ? _LLU(get_unaligned_be64(pFirst)) : ~0ULL); | 154 | pFirst ? _LLU(get_unaligned_be64(pFirst)) : ~0ULL); |
155 | 155 | ||
156 | if (a >= nelem) | 156 | if (a >= nelem) |
@@ -158,7 +158,7 @@ static int _osd_print_system_info(struct osd_dev *od, void *caps) | |||
158 | 158 | ||
159 | /* FIXME: Where are the time utilities */ | 159 | /* FIXME: Where are the time utilities */ |
160 | pFirst = get_attrs[a++].val_ptr; | 160 | pFirst = get_attrs[a++].val_ptr; |
161 | OSD_INFO("OSD_ATTR_RI_CLOCK [0x%02x%02x%02x%02x%02x%02x]\n", | 161 | OSD_INFO("CLOCK [0x%02x%02x%02x%02x%02x%02x]\n", |
162 | ((char *)pFirst)[0], ((char *)pFirst)[1], | 162 | ((char *)pFirst)[0], ((char *)pFirst)[1], |
163 | ((char *)pFirst)[2], ((char *)pFirst)[3], | 163 | ((char *)pFirst)[2], ((char *)pFirst)[3], |
164 | ((char *)pFirst)[4], ((char *)pFirst)[5]); | 164 | ((char *)pFirst)[4], ((char *)pFirst)[5]); |
@@ -169,7 +169,8 @@ static int _osd_print_system_info(struct osd_dev *od, void *caps) | |||
169 | 169 | ||
170 | hex_dump_to_buffer(get_attrs[a].val_ptr, len, 32, 1, | 170 | hex_dump_to_buffer(get_attrs[a].val_ptr, len, 32, 1, |
171 | sid_dump, sizeof(sid_dump), true); | 171 | sid_dump, sizeof(sid_dump), true); |
172 | OSD_INFO("OSD_ATTR_RI_OSD_SYSTEM_ID(%d) [%s]\n", len, sid_dump); | 172 | OSD_INFO("OSD_SYSTEM_ID(%d)\n" |
173 | " [%s]\n", len, sid_dump); | ||
173 | a++; | 174 | a++; |
174 | } | 175 | } |
175 | out: | 176 | out: |