dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-25 16:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ata_id: unreverse WWN identifier

Browse Source 
An endianness conversion was lost in 6024a6e302.
Restore it. Now ata_id and scsi_id output match.

https://bugzilla.redhat.com/show_bug.cgi?id=1227503
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2015-07-22 00:23:47 -04:00
parent 899c4195c6
commit 01f61d331b
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/udev/ata_id/ata_id.c
View File

@@ -638,10 +638,20 @@ int main(int argc, char *argv[])
* All other values are reserved.
*/
word = identify.wyde[108];
if ((word & 0xf000) == 0x5000)
if ((word & 0xf000) == 0x5000) {
uint64_t wwwn;
wwwn = identify.wyde[108];
wwwn <<= 16;
wwwn |= identify.wyde[109];
wwwn <<= 16;
wwwn |= identify.wyde[110];
wwwn <<= 16;
wwwn |= identify.wyde[111];
printf("ID_WWN=0x%1$" PRIx64 "\n"
"ID_WWN_WITH_EXTENSION=0x%1$" PRIx64 "\n",
identify.octa[108/4]);
wwwn);
}
/* from Linux's include/linux/ata.h */
if (identify.wyde[0] == 0x848a ||