diff for duplicates of <43BE7203.8060404@edesix.com> diff --git a/a/1.txt b/N1/1.txt index 385794f..a72f9b3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,19 +7,17 @@ I can confirm that your patch works for me too. Original scsi_id output: # scsi_id -g -x -s /block/sda | grep ID_SERIAL -ID_SERIAL -TA_Maxtor_6Y160M0_Linux_ATA-SCSI_simulator +ID_SERIAL=0ATA_Maxtor_6Y160M0_Linux_ATA-SCSI_simulator After my patch: # scsi_id -g -x -s /block/sda | grep ID_SERIAL -ID_SERIAL -TA_Maxtor_6Y160M0_Y4DCTR3E +ID_SERIAL=0ATA_Maxtor_6Y160M0_Y4DCTR3E After your patch: # scsi_id -g -x -s /block/sda | grep ID_SERIAL -ID_SERIAL\x1aTA_Maxtor_6Y160M0_Y4DCTR3E +ID_SERIAL=1ATA_Maxtor_6Y160M0_Y4DCTR3E Note that it is still a bit different to the page 0x80 output, but I don't think this matters (unless that '0' or '1' is a bug not a @@ -28,7 +26,7 @@ feature). For my purposes, it just needs to be unique. # ( scsi_id -p 0x80 -g -x -s /block/sda ; \ scsi_id -p 0x83 -g -x -s /block/sda ) | grep ID_SERIAL ID_SERIAL=SATA_Maxtor_6Y160M0_Y4DCTR3E -ID_SERIAL\x1aTA_Maxtor_6Y160M0_Y4DCTR3E +ID_SERIAL=1ATA_Maxtor_6Y160M0_Y4DCTR3E Many thanks, Chris. @@ -37,7 +35,7 @@ Chris. > > The attachment adds the second item above to the patch > suggested by Chris Paulson-Ellis <chris@edesix.com> in: -> http://marc.theaimsgroup.com/?l=linux-hotplug-devel&m\x113529667019652&w=2 +> http://marc.theaimsgroup.com/?l=linux-hotplug-devel&m=113529667019652&w=2 > > The patch is against lk 2.6.15 and was tested on a sil > controller with a Seagate ST380013AS sata disk. @@ -101,7 +99,7 @@ Chris. > - rbuf[4 + 3] = strlen(inq_83_str); > - memcpy(rbuf + 4 + 4, inq_83_str, strlen(inq_83_str)); > + if (buflen > (ATA_SERNO_LEN + num + 3)) { -> + /* piv=0, assoc=lu, code_set¬SII, designator=vendor */ +> + /* piv=0, assoc=lu, code_set=ACSII, designator=vendor */ > + rbuf[num + 0] = 2; > + rbuf[num + 3] = ATA_SERNO_LEN; > + num += 4; @@ -112,7 +110,7 @@ Chris. > - > + if (buflen > (sat_model_serial_desc_len + num + 3)) { > + /* SAT defined lu model and serial numbers descriptor */ -> + /* piv=0, assoc=lu, code_set¬SII, designator=t10 vendor id */ +> + /* piv=0, assoc=lu, code_set=ACSII, designator=t10 vendor id */ > + rbuf[num + 0] = 2; > + rbuf[num + 1] = 1; > + rbuf[num + 3] = sat_model_serial_desc_len; @@ -130,16 +128,4 @@ Chris. > return 0; > } > -> - - - -------------------------------------------------------- -This SF.net email is sponsored by: Splunk Inc. Do you grep through log files -for problems? Stop! Download the new AJAX search engine that makes -searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! -http://ads.osdn.com/?ad_idv37&alloc_id\x16865&op=click -_______________________________________________ -Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net -Linux-hotplug-devel@lists.sourceforge.net -https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel +> diff --git a/a/content_digest b/N1/content_digest index 5585d54..8f9b54f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -29,19 +29,17 @@ "Original scsi_id output:\n" "\n" "# scsi_id -g -x -s /block/sda | grep ID_SERIAL\n" - "ID_SERIAL\n" - "TA_Maxtor_6Y160M0_Linux_ATA-SCSI_simulator\n" + "ID_SERIAL=0ATA_Maxtor_6Y160M0_Linux_ATA-SCSI_simulator\n" "\n" "After my patch:\n" "\n" "# scsi_id -g -x -s /block/sda | grep ID_SERIAL\n" - "ID_SERIAL\n" - "TA_Maxtor_6Y160M0_Y4DCTR3E\n" + "ID_SERIAL=0ATA_Maxtor_6Y160M0_Y4DCTR3E\n" "\n" "After your patch:\n" "\n" "# scsi_id -g -x -s /block/sda | grep ID_SERIAL\n" - "ID_SERIAL\032TA_Maxtor_6Y160M0_Y4DCTR3E\n" + "ID_SERIAL=1ATA_Maxtor_6Y160M0_Y4DCTR3E\n" "\n" "Note that it is still a bit different to the page 0x80 output, but I \n" "don't think this matters (unless that '0' or '1' is a bug not a \n" @@ -50,7 +48,7 @@ "# ( scsi_id -p 0x80 -g -x -s /block/sda ; \\\n" " scsi_id -p 0x83 -g -x -s /block/sda ) | grep ID_SERIAL\n" "ID_SERIAL=SATA_Maxtor_6Y160M0_Y4DCTR3E\n" - "ID_SERIAL\032TA_Maxtor_6Y160M0_Y4DCTR3E\n" + "ID_SERIAL=1ATA_Maxtor_6Y160M0_Y4DCTR3E\n" "\n" "Many thanks,\n" "Chris.\n" @@ -59,7 +57,7 @@ "> \n" "> The attachment adds the second item above to the patch\n" "> suggested by Chris Paulson-Ellis <chris@edesix.com> in:\n" - "> http://marc.theaimsgroup.com/?l=linux-hotplug-devel&m\0213529667019652&w=2\n" + "> http://marc.theaimsgroup.com/?l=linux-hotplug-devel&m=113529667019652&w=2\n" "> \n" "> The patch is against lk 2.6.15 and was tested on a sil\n" "> controller with a Seagate ST380013AS sata disk.\n" @@ -123,7 +121,7 @@ "> -\t\trbuf[4 + 3] = strlen(inq_83_str);\n" "> -\t\tmemcpy(rbuf + 4 + 4, inq_83_str, strlen(inq_83_str));\n" "> +\tif (buflen > (ATA_SERNO_LEN + num + 3)) {\n" - "> +\t\t/* piv=0, assoc=lu, code_set\302\254SII, designator=vendor */\n" + "> +\t\t/* piv=0, assoc=lu, code_set=ACSII, designator=vendor */\n" "> +\t\trbuf[num + 0] = 2;\t\n" "> +\t\trbuf[num + 3] = ATA_SERNO_LEN;\n" "> +\t\tnum += 4;\n" @@ -134,7 +132,7 @@ "> -\n" "> +\tif (buflen > (sat_model_serial_desc_len + num + 3)) {\n" "> +\t\t/* SAT defined lu model and serial numbers descriptor */\n" - "> +\t\t/* piv=0, assoc=lu, code_set\302\254SII, designator=t10 vendor id */\n" + "> +\t\t/* piv=0, assoc=lu, code_set=ACSII, designator=t10 vendor id */\n" "> +\t\trbuf[num + 0] = 2;\t\n" "> +\t\trbuf[num + 1] = 1;\t\n" "> +\t\trbuf[num + 3] = sat_model_serial_desc_len;\n" @@ -152,18 +150,6 @@ "> \treturn 0;\n" "> }\n" "> \n" - "> \n" - "\n" - "\n" - "\n" - "-------------------------------------------------------\n" - "This SF.net email is sponsored by: Splunk Inc. Do you grep through log files\n" - "for problems? Stop! Download the new AJAX search engine that makes\n" - "searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!\n" - "http://ads.osdn.com/?ad_idv37&alloc_id\026865&op=click\n" - "_______________________________________________\n" - "Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net\n" - "Linux-hotplug-devel@lists.sourceforge.net\n" - https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel + > -70c06ba7894862a99b70be7502e5854efb253b3199caf48a537c502c860f0143 +bdca6aeee46f8854c389dd690417d4a5cf8a9a42fb6e62cfaa2e142cdf8a59cd
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.