diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | doc/sg_compare_and_write.8 | 2 | ||||
| -rw-r--r-- | doc/sg_inq.8 | 2 | ||||
| -rw-r--r-- | doc/sg_luns.8 | 20 | ||||
| -rw-r--r-- | doc/sg_map.8 | 8 | ||||
| -rw-r--r-- | doc/sg_map26.8 | 2 | ||||
| -rw-r--r-- | doc/sg_reset.8 | 6 | ||||
| -rw-r--r-- | doc/sg_write_buffer.8 | 2 | ||||
| -rw-r--r-- | doc/sg_write_same.8 | 2 | ||||
| -rw-r--r-- | doc/sg_xcopy.8 | 2 | ||||
| -rw-r--r-- | src/sg_inq.c | 4 |
11 files changed, 26 insertions, 26 deletions
@@ -2,7 +2,7 @@ Each utility has its own version number, date of last change and some description at the top of its ".c" file. All utilities in the main directory have their own "man" pages. There is also a sg3_utils man page. -Changelog for sg3_utils-1.36 [20130312] [svn: r488] +Changelog for sg3_utils-1.36 [20130313] [svn: r489] - sg_vpd: Protocol-specific port information VPD page for SAS SSP, persistent connection (spl3r2) - sg_xcopy: handle more descriptor types; handle zero diff --git a/doc/sg_compare_and_write.8 b/doc/sg_compare_and_write.8 index f9e42185..77a61397 100644 --- a/doc/sg_compare_and_write.8 +++ b/doc/sg_compare_and_write.8 @@ -15,7 +15,7 @@ containing \fInum\fR blocks, the \fIDEVICE\fR will read \fInum\fR blocks starting at logical block address \fILBA\fR, compare the data read from the specified blocks to the verify instance and if they match, write the write instance to the \fIDEVICE\fR at the same logical block address \fILBA\fR. -All of the above operations shall be performed as an uninteruppted series of +All of the above operations shall be performed as an uninterrupted series of actions. .PP The data buffer which contains the verify and write instances are obtained diff --git a/doc/sg_inq.8 b/doc/sg_inq.8 index 5f6b7a8f..08b46e34 100644 --- a/doc/sg_inq.8 +++ b/doc/sg_inq.8 @@ -55,7 +55,7 @@ option name. \fB\-a\fR, \fB\-\-ata\fR Assume given \fIDEVICE\fR is an ATA or ATAPI device which can receive ATA commands from the host operating system. Skip the SCSI INQUIRY command and -use either the ATA IDENTIFY DEVICE command (for nonpacket devices) or the +use either the ATA IDENTIFY DEVICE command (for non-packet devices) or the ATA IDENTIFY PACKET DEVICE command. To show the response in hex, add a '\-\-verbose' option. This option is only available in Linux. .TP diff --git a/doc/sg_luns.8 b/doc/sg_luns.8 index bd63a51f..aa38d472 100644 --- a/doc/sg_luns.8 +++ b/doc/sg_luns.8 @@ -26,7 +26,7 @@ SAM\-4 and SAM\-5 (revision 13, section 4.7) . Arguments to long options are mandatory for short options as well. .TP \fB\-d\fR, \fB\-\-decode\fR -decode luns into their component parts, as described in the LUN section +decode LUNs into their component parts, as described in the LUN section of SAM\-3, SAM\-4 and SAM\-5. .TP \fB\-h\fR, \fB\-\-help\fR @@ -44,7 +44,7 @@ the cdb's "allocation length" field. If not given (or \fILEN\fR is zero) then 8192 is used. The maximum allowed value of \fILEN\fR is 65536. .TP \fB\-q\fR, \fB\-\-quiet\fR -output ASCII hex rendering of each report lun, one per line. +output ASCII hex rendering of each report LUN, one per line. .TP \fB\-r\fR, \fB\-\-raw\fR output response in binary (to stdout). @@ -56,11 +56,11 @@ REPORT LUNS command in SPC (most recent is SPC\-4 revision 36e in section 6.33). To simplify, for the I_T nexus associated with the \fIDEVICE\fR, the meanings of the \fISR\fR values and the corresponding responses are: .br - \fB0\fR : all luns excluding well known logical units + \fB0\fR : all LUNs excluding well known logical units .br \fB1\fR : well known logical units .br - \fB2\fR : all luns + \fB2\fR : all LUNs .br Values between 0xf8 and 0xff (inclusive) are vendor specific (SPC\-4 rev 36e), other values greater than 2 are reserved. @@ -101,12 +101,12 @@ If the \fI\-\-hex\fR option is given once for the version of this utility that sends a REPORT LUNS command to \fIDEVICE\fR then the response is printed in hexadecimal. If the \fI\-\-hex\fR option is given twice then in the decoded output (if requested) some of the component fields (e.g. the -actual lun) are printed in hex with leading zeros. If the \fI\-\-hex\fR +actual LUN) are printed in hex with leading zeros. If the \fI\-\-hex\fR option is given once for the \fI\-\-test=\fR form of this utility then in the decoded output some of the component fields are printed in hex with leading zeros. This is to indicate the size of the component field. For example: in the Peripheral device addressing method (16 bits overall), the -bus ID is 6 bits wide and the target/lun field is 8 bits wide; so both are +bus ID is 6 bits wide and the target/LUN field is 8 bits wide; so both are shown with two hex digits (e.g. bus_id=0x02, target=0x3a). .SH EXAMPLES Typically by the time user space programs get to run, SCSI LUs have been @@ -114,7 +114,7 @@ discovered. In Linux the lsscsi utility lists the LUs that are currently present. The LUN of a device (LU) is the fourth element in the tuple at the beginning of each line. Below we see a target (or "I_T Nexus": "6:0:0") has two LUNS: 1 and 49409. If 49409 is converted into t10 LUN format it is -0xc101000000000000 which is the REPORT LUNS well known lun. +0xc101000000000000 which is the REPORT LUNS well known LUN. .PP # lsscsi \-g .br @@ -147,7 +147,7 @@ Now decode that LUN: .br Peripheral device addressing: lun=1 .PP -Would like to see how wide that component lun field is: +Would like to see how wide that component LUN field is: # sg_luns \-d \-q \-HH /dev/sg1 .br 0001000000000000 @@ -156,13 +156,13 @@ Would like to see how wide that component lun field is: .PP So it is 8 bits wide (actually between 5 and 8 bits wide, inclusive). Now use \fI\-\-select=1\fR to find out if there are any well known -luns: +LUNs: .PP # sg_luns \-q \-s 1 /dev/sg1 .br c101000000000000 .PP -So how many luns do we have all together (associated with the current +So how many LUNs do we have all together (associated with the current I_T Nexus): .PP # sg_luns \-q \-s 2 /dev/sg1 diff --git a/doc/sg_map.8 b/doc/sg_map.8 index 1501228a..ebb2037f 100644 --- a/doc/sg_map.8 +++ b/doc/sg_map.8 @@ -1,6 +1,6 @@ .TH SG_MAP "8" "December 2006" "sg3_utils\-1.23" SG3_UTILS .SH NAME -sg_map \- displays mapping between linux sg and other SCSI devices +sg_map \- displays mapping between Linux sg and other SCSI devices .SH SYNOPSIS .B sg_map [\fI\-a\fR] [\fI-h\fR] [\fI\-i\fR] [\fI\-n\fR] [\fI\-scd\fR] [\fI\-sd\fR] @@ -20,7 +20,7 @@ name. assume the sg devices have alphabetical device names and loop through /dev/sga, /dev/sgb, etc. Default is numeric scan. Note that sg device nodes with an alphabetical index have been -deprecated since the linux kernel 2.2 series. +deprecated since the Linux kernel 2.2 series. .TP \fB\-h\fR print usage message then exit. @@ -72,7 +72,7 @@ observing the output of the command: "cat /proc/scsi/scsi". However if devices have been added since boot this can be deceptive. .PP -In the linux kernel 2.6 series something close to the mapping +In the Linux kernel 2.6 series something close to the mapping shown by this utility can be found by analysing sysfs. The main difference is that sysfs analysis will show the mapping between sg nodes and other SCSI device nodes in terms of @@ -91,7 +91,7 @@ was not supported in Linux. It used a simple algorithm to scan sg device nodes in ascending numeric or alphabetical order, stopping after there were 5 consecutive errors. .PP -In the linux kernel 2.6 series, this utility uses sysfs to find which +In the Linux kernel 2.6 series, this utility uses sysfs to find which sg device nodes are active and only checks those. Hence there can be large "holes" in the numbering of sg device nodes (e.g. after an adapter has been removed) and still all active sg device nodes will diff --git a/doc/sg_map26.8 b/doc/sg_map26.8 index 121a0180..2cef1544 100644 --- a/doc/sg_map26.8 +++ b/doc/sg_map26.8 @@ -76,7 +76,7 @@ increase the level of verbosity, (i.e. debug output). \fB\-V\fR, \fB\-\-version\fR print the version string and then exit. .SH NOTES -This utility is designed for the linux 2.6 (and later) kernel series. +This utility is designed for the Linux 2.6 (and later) kernel series. It uses special file major and minor numbers (and whether the special is block or character) together with sysfs to do its mapping or matching. In the absence of any other information, device special diff --git a/doc/sg_reset.8 b/doc/sg_reset.8 index 3cfc326b..4eaa8b26 100644 --- a/doc/sg_reset.8 +++ b/doc/sg_reset.8 @@ -19,12 +19,12 @@ A device reset is applied to the Logical Unit (LU) corresponding to \fIDEVICE\fR. It is most likely implemented by a Low level Driver (LLD) in Linux as a LOGICAL UNIT RESET task management function. .PP -The ability to reset a SCSI target was added in linux kernel 2.6.27 . A LLD +The ability to reset a SCSI target was added in Linux kernel 2.6.27 . A LLD may send Low level Drivers (LLDs) the I_T NEXUS RESET task management function. Alternatively it may use a transport mechanism to do the same thing (e.g. a hard reset on the link containing a SAS target). .PP -In the linux kernel 2.6 series this utility can be called on sd, sr (cd/dvd), +In the Linux kernel 2.6 series this utility can be called on sd, sr (cd/dvd), st or sg device nodes; if the user has appropriate permissions. .SH OPTIONS .TP @@ -100,7 +100,7 @@ stands for Initiator\-Target. .PP Transports may have their own types of resets not supported by this utility. For example SAS has a link reset in which both ends of a physical link (e.g. -between a SAS expander and a SAS tape drive) renogiatate their connection. +between a SAS expander and a SAS tape drive) renegotiate their connection. .PP Prior to version 0.57 of this utility the command line had short options only (e.g. \fI\-d\fR but not \fI\-\-device\fR). Also \fI\-h\fR invoked a host diff --git a/doc/sg_write_buffer.8 b/doc/sg_write_buffer.8 index 2fa71617..98930d02 100644 --- a/doc/sg_write_buffer.8 +++ b/doc/sg_write_buffer.8 @@ -80,7 +80,7 @@ required then the \fI\-\-length=LEN\fR option should be given. The user should be aware that most operating systems have limits on the amount of data that can be sent with one SCSI command. In Linux this depends on the pass through mechanism used (e.g. block SG_IO or -the sg driver) and various setting in sysfs in the linux lk 2.6 +the sg driver) and various setting in sysfs in the Linux lk 2.6 series (e.g. /sys/block/sda/queue/max_sectors_kb). .PP Downloading incorrect microcode into a device has the ability to render diff --git a/doc/sg_write_same.8 b/doc/sg_write_same.8 index f9657062..84a21320 100644 --- a/doc/sg_write_same.8 +++ b/doc/sg_write_same.8 @@ -135,7 +135,7 @@ sets the "Write protect" field in the WRITE SAME cdb to \fIWPR\fR. The default value is zero. \fIWPR\fR should be a value between 0 and 7. When \fIWPR\fR is 1 or greater, and the disk's protection type is 1 or greater, then 8 extra bytes of protection information are expected or -generated (to place in the commmand's data out buffer). +generated (to place in the command's data out buffer). .TP \fB\-x\fR, \fB\-\-xferlen\fR=\fILEN\fR where \fILEN\fR is the data out buffer length. Defaults to the length of diff --git a/doc/sg_xcopy.8 b/doc/sg_xcopy.8 index debae41a..1d151c21 100644 --- a/doc/sg_xcopy.8 +++ b/doc/sg_xcopy.8 @@ -48,7 +48,7 @@ device block size. .TP \fBcat\fR=0 | 1 sets the SCSI EXTENDED COPY command segment descriptor CAT bit to 0 or -1 (default: 0). The CAT bit (in conjuction with the PAD bit) controls +1 (default: 0). The CAT bit (in conjunction with the PAD bit) controls the handling of residual data. See section .B HANDLING OF RESIDUAL DATA for details. diff --git a/src/sg_inq.c b/src/sg_inq.c index b9f992d7..182b1852 100644 --- a/src/sg_inq.c +++ b/src/sg_inq.c @@ -67,7 +67,7 @@ * information [MAINTENANCE IN, service action = 0xc]; see sg_opcodes. */ -static char * version_str = "1.12 20130312"; /* SPC-4 rev 36 */ +static char * version_str = "1.13 20130313"; /* SPC-4 rev 36 */ /* Following VPD pages are in ascending page number order */ @@ -2363,7 +2363,7 @@ process_std_inq(int sg_fd, const struct opts_t * optsp) else act_len = (rlen < len) ? rlen : len; /* don't use more than HBA's resid says was transferred from LU */ - if (act_len < (rlen - resid)) + if (act_len > (rlen - resid)) act_len = rlen - resid; if (optsp->do_raw) dStrRaw((const char *)rsp_buff, act_len); |