mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-22 21:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-11-18 19:37:02 -08:00
parent 39c47c733a 0f4547b0ff
commit c1ec5e0633
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scst/src/dev_handlers/scst_vdisk.c
View File

@@ -3706,14 +3706,14 @@ static int vdisk_usn_vpd(uint8_t *buf, struct scst_cmd *cmd,
{
uint16_t usn_len, max_len = INQ_BUF_SZ - 4;
BUILD_BUG_ON(sizeof(virt_dev->usn) > INQ_BUF_SZ - 4);
buf[1] = 0x80;
if (cmd->tgtt->get_serial) {
usn_len = cmd->tgtt->get_serial(cmd->tgt_dev, &buf[4], max_len);
} else {
read_lock(&vdisk_serial_rwlock);
usn_len = strlen(virt_dev->usn);
if (WARN_ON_ONCE(usn_len > max_len))
usn_len = max_len;
memcpy(&buf[4], virt_dev->usn, usn_len);
read_unlock(&vdisk_serial_rwlock);
}