From 7064271ae778abdf846bbb8438fa1016133cd72a Mon Sep 17 00:00:00 2001
From: ioito <qu_xuan@icloud.com>
Date: Thu, 12 Sep 2019 18:15:50 +0800
Subject: [PATCH] fix: update vendor

---
 go.mod                                    |  2 +-
 go.sum                                    |  2 ++
 vendor/github.com/ceph/go-ceph/rbd/rbd.go | 25 ++++++++++++-----------
 vendor/modules.txt                        |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/go.mod b/go.mod
index 25849a497b..ad7300e835 100644
--- a/go.mod
+++ b/go.mod
@@ -157,4 +157,4 @@ require (
 	yunion.io/x/structarg v0.0.0-20190809075558-115bed041de3
 )
 
-replace github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190912140512-ccc6576c3fe2ef6de74aa1473b9401d95c7cd7c1
+replace github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190918140512-6eff6e97c193d7876334bf24f19ce0d1ed86d73a
diff --git a/go.sum b/go.sum
index 3d25f8c233..71447dc91b 100644
--- a/go.sum
+++ b/go.sum
@@ -450,6 +450,8 @@ github.com/yunionio/go-ceph v0.0.0-20190912140512-c51b8478c h1:/9QrgZBxNyq1HsJk5
 github.com/yunionio/go-ceph v0.0.0-20190912140512-c51b8478c/go.mod h1:8XuBae5AzsgotLArJSewMruYVaQs8AlfsK5jBCG8T9Y=
 github.com/yunionio/go-ceph v0.0.0-20190912140512-ccc6576c3fe2ef6de74aa1473b9401d95c7cd7c1 h1:TURJ5mfG3+iRJBDDNLl+gy9CDpIQlgDlvAbzF1+WwVo=
 github.com/yunionio/go-ceph v0.0.0-20190912140512-ccc6576c3fe2ef6de74aa1473b9401d95c7cd7c1/go.mod h1:8XuBae5AzsgotLArJSewMruYVaQs8AlfsK5jBCG8T9Y=
+github.com/yunionio/go-ceph v0.0.0-20190918140512-6eff6e97c193d7876334bf24f19ce0d1ed86d73a h1:o6a7Gq95XxgizBdZ4GYUOOGtA8b7qrOQvPd5DhxggNo=
+github.com/yunionio/go-ceph v0.0.0-20190918140512-6eff6e97c193d7876334bf24f19ce0d1ed86d73a/go.mod h1:8XuBae5AzsgotLArJSewMruYVaQs8AlfsK5jBCG8T9Y=
 go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v3.3.10+incompatible h1:qXVcIR1kU3CYLD8zXDseOmBNwg0uaui53e4Wg4uj0rk=
diff --git a/vendor/github.com/ceph/go-ceph/rbd/rbd.go b/vendor/github.com/ceph/go-ceph/rbd/rbd.go
index 2639167eeb..6dfd249f00 100644
--- a/vendor/github.com/ceph/go-ceph/rbd/rbd.go
+++ b/vendor/github.com/ceph/go-ceph/rbd/rbd.go
@@ -789,29 +789,30 @@ func (image *Image) GetSnapshotNames() (snaps []SnapInfo, err error) {
 
 	var c_max_snaps C.int = 10
 	var c_snaps []C.rbd_snap_info_t
+	var snapCount C.int
 
 	for i := 0; i < 3; i++ {
 		c_snaps = make([]C.rbd_snap_info_t, c_max_snaps)
-		snaps = make([]SnapInfo, c_max_snaps)
-
-		ret := C.rbd_snap_list(image.image, &c_snaps[0], &c_max_snaps)
-		if ret != -C.ERANGE {
-			if ret >= 0 {
+		snapCount = C.rbd_snap_list(image.image, &c_snaps[0], &c_max_snaps)
+		if snapCount != -C.ERANGE {
+			if snapCount >= 0 {
 				break
-			} else if ret < 0 {
-				return nil, RBDError(ret)
+			} else if snapCount < 0 {
+				return nil, RBDError(snapCount)
 			}
 		}
 	}
 
-	for i, s := range c_snaps {
-		snaps[i] = SnapInfo{Id: uint64(s.id),
-			Size: uint64(s.size),
-			Name: C.GoString(s.name)}
+	snaps = make([]SnapInfo, snapCount)
+
+	for i := 0; i < int(snapCount); i++ {
+		snaps[i] = SnapInfo{Id: uint64(c_snaps[i].id),
+			Size: uint64(c_snaps[i].size),
+			Name: C.GoString(c_snaps[i].name)}
 	}
 
 	C.rbd_snap_list_end(&c_snaps[0])
-	return snaps[:len(snaps)-1], nil
+	return snaps, nil
 }
 
 // int rbd_snap_create(rbd_image_t image, const char *snapname);
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 1f5521425e..71bd2008ce 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -152,7 +152,7 @@ github.com/boombuler/barcode/utils
 github.com/bradfitz/iter
 # github.com/c-bata/go-prompt v0.2.1
 github.com/c-bata/go-prompt
-# github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190912140512-ccc6576c3fe2ef6de74aa1473b9401d95c7cd7c1
+# github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190918140512-6eff6e97c193d7876334bf24f19ce0d1ed86d73a
 github.com/ceph/go-ceph/rados
 github.com/ceph/go-ceph/rbd
 # github.com/coredns/coredns v1.3.0