mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-01-30 16:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: drop deprecated Rbd prefix from go-ceph rbd.ImageOption*

Browse Source 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2025-01-30 10:20:25 +01:00 committed by mergify[bot]
parent c905dd863c
commit b1834552c1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/rbd/rbd_util.go
View File

@ -1587,14 +1587,14 @@ func (rv *rbdVolume) constructImageOptions(ctx context.Context) (*librbd.ImageOp
logMsg := fmt.Sprintf("setting image options on %s", rv)
if rv.DataPool != "" {
logMsg += ", data pool " + rv.DataPool
err = options.SetString(librbd.RbdImageOptionDataPool, rv.DataPool)
err = options.SetString(librbd.ImageOptionDataPool, rv.DataPool)
if err != nil {
return nil, fmt.Errorf("failed to set data pool: %w", err)
}
}
if rv.ImageFeatureSet != 0 {
err = options.SetUint64(librbd.RbdImageOptionFeatures, uint64(rv.ImageFeatureSet))
err = options.SetUint64(librbd.ImageOptionFeatures, uint64(rv.ImageFeatureSet))
if err != nil {
return nil, fmt.Errorf("failed to set image features: %w", err)
}
@ -1602,11 +1602,11 @@ func (rv *rbdVolume) constructImageOptions(ctx context.Context) (*librbd.ImageOp
if rv.StripeCount != 0 {
logMsg += fmt.Sprintf(", stripe count %d, stripe unit %d", rv.StripeCount, rv.StripeUnit)
err = options.SetUint64(librbd.RbdImageOptionStripeCount, rv.StripeCount)
err = options.SetUint64(librbd.ImageOptionStripeCount, rv.StripeCount)
if err != nil {
return nil, fmt.Errorf("failed to set stripe count: %w", err)
}
err = options.SetUint64(librbd.RbdImageOptionStripeUnit, rv.StripeUnit)
err = options.SetUint64(librbd.ImageOptionStripeUnit, rv.StripeUnit)
if err != nil {
return nil, fmt.Errorf("failed to set stripe unit: %w", err)
}
@ -1615,7 +1615,7 @@ func (rv *rbdVolume) constructImageOptions(ctx context.Context) (*librbd.ImageOp
if rv.ObjectSize != 0 {
order := uint64(math.Log2(float64(rv.ObjectSize)))
logMsg += fmt.Sprintf(", object size %d, order %d", rv.ObjectSize, order)
err = options.SetUint64(librbd.RbdImageOptionOrder, order)
err = options.SetUint64(librbd.ImageOptionOrder, order)
if err != nil {
return nil, fmt.Errorf("failed to set object size: %w", err)
}