admin/gotgt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename: Thinprovisioning -> ThinProvisioning

Browse Source
This commit is contained in:
chessman
2019-06-10 12:42:21 +03:00
parent ae74f39fa8
commit e2b7ea4891
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/config.json
View File

@@ -3,7 +3,9 @@
{ {
"deviceID":1000, "deviceID":1000,
"path":"file:/var/tmp/disk.img", "path":"file:/var/tmp/disk.img",
"online":true "online":true,
"thinProvisioning":false,
"blockShift": 9,
} }
], ],
"iscsiportals":[ "iscsiportals":[

2
pkg/api/types.go
View File

@@ -264,7 +264,7 @@ type SCSILuPhyAttribute struct {
// Software Write Protect // Software Write Protect
SWP bool SWP bool
// Use thin-provisioning for this LUN // Use thin-provisioning for this LUN
Thinprovisioning bool ThinProvisioning bool
// Logical Unit online // Logical Unit online
Online bool Online bool
// Descrptor format sense data supported // Descrptor format sense data supported

2
pkg/config/config.go
View File

@@ -104,7 +104,7 @@ type BackendStorage struct {
DeviceID uint64 `json:"deviceID"` DeviceID uint64 `json:"deviceID"`
Path string `json:"path"` Path string `json:"path"`
Online bool `json:"online"` Online bool `json:"online"`
Thinprovisioning bool `json:"thinprovisioning"` ThinProvisioning bool `json:"thinProvisioning"`
BlockShift uint `json:"blockShift"` BlockShift uint `json:"blockShift"`
} }

2
pkg/scsi/lun.go
View File

@@ -53,7 +53,7 @@ func NewSCSILu(bs *config.BackendStorage) (*api.SCSILu, error) {
} }
lu.Size = backing.Size(lu) lu.Size = backing.Size(lu)
lu.DeviceProtocol.InitLu(lu) lu.DeviceProtocol.InitLu(lu)
lu.Attrs.Thinprovisioning = bs.Thinprovisioning lu.Attrs.ThinProvisioning = bs.ThinProvisioning
lu.Attrs.Online = bs.Online lu.Attrs.Online = bs.Online
lu.Attrs.Lbppbe = 3 lu.Attrs.Lbppbe = 3
return lu, nil return lu, nil

6
pkg/scsi/sbc.go
View File

@@ -59,7 +59,7 @@ func (sbc SBCSCSIDeviceProtocol) InitLu(lu *api.SCSILu) error {
// init LU's phy attribute // init LU's phy attribute
lu.Attrs.DeviceType = sbc.DeviceType lu.Attrs.DeviceType = sbc.DeviceType
lu.Attrs.Qualifier = false lu.Attrs.Qualifier = false
lu.Attrs.Thinprovisioning = false lu.Attrs.ThinProvisioning = false
lu.Attrs.Removable = false lu.Attrs.Removable = false
lu.Attrs.Readonly = false lu.Attrs.Readonly = false
lu.Attrs.SWP = false lu.Attrs.SWP = false
@@ -380,7 +380,7 @@ func SBCReadWrite(host int, cmd *api.SCSICommand) api.SAMStat {
goto sense goto sense
} }
// We only support unmap for thin provisioned LUNS // We only support unmap for thin provisioned LUNS
if (scb[1]&0x08 != 0) && !dev.Attrs.Thinprovisioning { if (scb[1]&0x08 != 0) && !dev.Attrs.ThinProvisioning {
key = ILLEGAL_REQUEST key = ILLEGAL_REQUEST
asc = ASC_INVALID_FIELD_IN_CDB asc = ASC_INVALID_FIELD_IN_CDB
goto sense goto sense
@@ -623,7 +623,7 @@ func SBCReadCapacity16(host int, cmd *api.SCSICommand) api.SAMStat {
copy(cmd.InSDBBuffer.Buffer[8:], util.MarshalUint32(uint32(1<<bshift))) copy(cmd.InSDBBuffer.Buffer[8:], util.MarshalUint32(uint32(1<<bshift)))
if allocationLength > 16 { if allocationLength > 16 {
var lbpme int var lbpme int
if cmd.Device.Attrs.Thinprovisioning { if cmd.Device.Attrs.ThinProvisioning {
lbpme = 1 lbpme = 1
} }
val := (cmd.Device.Attrs.Lbppbe << 16) | (lbpme << 15) | cmd.Device.Attrs.LowestAlignedLBA val := (cmd.Device.Attrs.Lbppbe << 16) | (lbpme << 15) | cmd.Device.Attrs.LowestAlignedLBA

4
pkg/scsi/spc.go
View File

@@ -196,7 +196,7 @@ func InquiryPage0xB0(host int, cmd *api.SCSICommand) (*bytes.Buffer, uint16) {
maxUnmapBlockDescriptorCount uint32 = 0 maxUnmapBlockDescriptorCount uint32 = 0
) )
if cmd.Device.Attrs.Thinprovisioning { if cmd.Device.Attrs.ThinProvisioning {
maxUnmapLbaCount = 0xFFFFFFFF maxUnmapLbaCount = 0xFFFFFFFF
maxUnmapBlockDescriptorCount = 0xFFFFFFFF maxUnmapBlockDescriptorCount = 0xFFFFFFFF
} }
@@ -243,7 +243,7 @@ func InquiryPage0xB2(host int, cmd *api.SCSICommand) (*bytes.Buffer, uint16) {
binary.Write(buf, binary.BigEndian, pageLength) binary.Write(buf, binary.BigEndian, pageLength)
var lbpu byte var lbpu byte
if cmd.Device.Attrs.Thinprovisioning { if cmd.Device.Attrs.ThinProvisioning {
lbpu = 1 << 7 lbpu = 1 << 7
} }