mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-02 19:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: rename ndbType parameter

Browse Source 
Fix "ndb" typo.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit d3f31187fc)
This commit is contained in:
Ilya Dryomov 2020-08-21 17:58:37 +02:00 committed by mergify[bot]
parent 2a090b785c
commit 6918cbe950
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/rbd/rbd_attach.go
View File

@ -289,7 +289,7 @@ func detachRBDDevice(ctx context.Context, devicePath, volumeID, unmapOptions str
// detachRBDImageOrDeviceSpec detaches an rbd imageSpec or devicePath, with additional checking // detachRBDImageOrDeviceSpec detaches an rbd imageSpec or devicePath, with additional checking
// when imageSpec is used to decide if image is already unmapped. // when imageSpec is used to decide if image is already unmapped.
func detachRBDImageOrDeviceSpec(ctx context.Context, imageOrDeviceSpec string, isImageSpec, ndbType, encrypted bool, volumeID, unmapOptions string) error { func detachRBDImageOrDeviceSpec(ctx context.Context, imageOrDeviceSpec string, isImageSpec, isNbd, encrypted bool, volumeID, unmapOptions string) error {
if encrypted { if encrypted {
mapperFile, mapperPath := util.VolumeMapper(volumeID) mapperFile, mapperPath := util.VolumeMapper(volumeID)
mappedDevice, mapper, err := util.DeviceEncryptionStatus(ctx, mapperPath) mappedDevice, mapper, err := util.DeviceEncryptionStatus(ctx, mapperPath)
@ -311,7 +311,7 @@ func detachRBDImageOrDeviceSpec(ctx context.Context, imageOrDeviceSpec string, i
} }
accessType := accessTypeKRbd accessType := accessTypeKRbd
if ndbType { if isNbd {
accessType = accessTypeNbd accessType = accessTypeNbd
} }
unmapArgs := []string{"unmap", "--device-type", accessType, imageOrDeviceSpec} unmapArgs := []string{"unmap", "--device-type", accessType, imageOrDeviceSpec}