From e2b7ea4891f522847fefc7364bc5d4d3c743dfe4 Mon Sep 17 00:00:00 2001
From: chessman <eugene@datomia.com>
Date: Mon, 10 Jun 2019 12:42:21 +0300
Subject: [PATCH] rename: Thinprovisioning -> ThinProvisioning

---
 examples/config.json | 4 +++-
 pkg/api/types.go     | 2 +-
 pkg/config/config.go | 2 +-
 pkg/scsi/lun.go      | 2 +-
 pkg/scsi/sbc.go      | 6 +++---
 pkg/scsi/spc.go      | 4 ++--
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/examples/config.json b/examples/config.json
index 2143c2b..0e749e7 100644
--- a/examples/config.json
+++ b/examples/config.json
@@ -3,7 +3,9 @@
     {
       "deviceID":1000,
       "path":"file:/var/tmp/disk.img",
-      "online":true
+      "online":true,
+      "thinProvisioning":false,
+      "blockShift": 9,
     }
   ],
   "iscsiportals":[
diff --git a/pkg/api/types.go b/pkg/api/types.go
index 59576fb..de303e7 100644
--- a/pkg/api/types.go
+++ b/pkg/api/types.go
@@ -264,7 +264,7 @@ type SCSILuPhyAttribute struct {
 	// Software Write Protect
 	SWP bool
 	// Use thin-provisioning for this LUN
-	Thinprovisioning bool
+	ThinProvisioning bool
 	// Logical Unit online
 	Online bool
 	// Descrptor format sense data supported
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 8aa95b9..6fb4a42 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -104,7 +104,7 @@ type BackendStorage struct {
 	DeviceID         uint64 `json:"deviceID"`
 	Path             string `json:"path"`
 	Online           bool   `json:"online"`
-	Thinprovisioning bool   `json:"thinprovisioning"`
+	ThinProvisioning bool   `json:"thinProvisioning"`
 	BlockShift       uint   `json:"blockShift"`
 }
 
diff --git a/pkg/scsi/lun.go b/pkg/scsi/lun.go
index 790377d..244b24a 100644
--- a/pkg/scsi/lun.go
+++ b/pkg/scsi/lun.go
@@ -53,7 +53,7 @@ func NewSCSILu(bs *config.BackendStorage) (*api.SCSILu, error) {
 	}
 	lu.Size = backing.Size(lu)
 	lu.DeviceProtocol.InitLu(lu)
-	lu.Attrs.Thinprovisioning = bs.Thinprovisioning
+	lu.Attrs.ThinProvisioning = bs.ThinProvisioning
 	lu.Attrs.Online = bs.Online
 	lu.Attrs.Lbppbe = 3
 	return lu, nil
diff --git a/pkg/scsi/sbc.go b/pkg/scsi/sbc.go
index 87ba500..58a9ba4 100644
--- a/pkg/scsi/sbc.go
+++ b/pkg/scsi/sbc.go
@@ -59,7 +59,7 @@ func (sbc SBCSCSIDeviceProtocol) InitLu(lu *api.SCSILu) error {
 	// init LU's phy attribute
 	lu.Attrs.DeviceType = sbc.DeviceType
 	lu.Attrs.Qualifier = false
-	lu.Attrs.Thinprovisioning = false
+	lu.Attrs.ThinProvisioning = false
 	lu.Attrs.Removable = false
 	lu.Attrs.Readonly = false
 	lu.Attrs.SWP = false
@@ -380,7 +380,7 @@ func SBCReadWrite(host int, cmd *api.SCSICommand) api.SAMStat {
 			goto sense
 		}
 		// 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
 			asc = ASC_INVALID_FIELD_IN_CDB
 			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)))
 		if allocationLength > 16 {
 			var lbpme int
-			if cmd.Device.Attrs.Thinprovisioning {
+			if cmd.Device.Attrs.ThinProvisioning {
 				lbpme = 1
 			}
 			val := (cmd.Device.Attrs.Lbppbe << 16) | (lbpme << 15) | cmd.Device.Attrs.LowestAlignedLBA
diff --git a/pkg/scsi/spc.go b/pkg/scsi/spc.go
index 63e5c24..29a2ea0 100644
--- a/pkg/scsi/spc.go
+++ b/pkg/scsi/spc.go
@@ -196,7 +196,7 @@ func InquiryPage0xB0(host int, cmd *api.SCSICommand) (*bytes.Buffer, uint16) {
 		maxUnmapBlockDescriptorCount uint32 = 0
 	)
 
-	if cmd.Device.Attrs.Thinprovisioning {
+	if cmd.Device.Attrs.ThinProvisioning {
 		maxUnmapLbaCount = 0xFFFFFFFF
 		maxUnmapBlockDescriptorCount = 0xFFFFFFFF
 	}
@@ -243,7 +243,7 @@ func InquiryPage0xB2(host int, cmd *api.SCSICommand) (*bytes.Buffer, uint16) {
 	binary.Write(buf, binary.BigEndian, pageLength)
 
 	var lbpu byte
-	if cmd.Device.Attrs.Thinprovisioning {
+	if cmd.Device.Attrs.ThinProvisioning {
 		lbpu = 1 << 7
 	}