RepoMirrors
/
go-ceph
mirror of https://github.com/ceph/go-ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rbd: naming conventions: fixes in ListLockers function 

Fix up variable names that don't meet Go standards.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2021-07-19 16:47:19 -04:00 committed by John Mulligan
parent 96846c2ccf
commit 05538bceab
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
rbd/rbd.go
View File

@ -589,55 +589,55 @@ func (image *Image) ListLockers() (tag string, lockers []Locker, err error) {
return "", nil, err return "", nil, err
} }
var c_exclusive C.int var cExclusive C.int
var c_tag_len, c_clients_len, c_cookies_len, c_addrs_len C.size_t var cTagLen, cClientsLen, cCookiesLen, cAddrsLen C.size_t
var c_locker_cnt C.ssize_t var cLockerCount C.ssize_t
C.rbd_list_lockers(image.image, &c_exclusive, C.rbd_list_lockers(image.image, &cExclusive,
nil, (*C.size_t)(&c_tag_len), nil, (*C.size_t)(&cTagLen),
nil, (*C.size_t)(&c_clients_len), nil, (*C.size_t)(&cClientsLen),
nil, (*C.size_t)(&c_cookies_len), nil, (*C.size_t)(&cCookiesLen),
nil, (*C.size_t)(&c_addrs_len)) nil, (*C.size_t)(&cAddrsLen))
// no locker held on rbd image when either c_clients_len, // no locker held on rbd image when either c_clients_len,
// c_cookies_len or c_addrs_len is *0*, so just quickly returned // c_cookies_len or c_addrs_len is *0*, so just quickly returned
if int(c_clients_len) == 0 || int(c_cookies_len) == 0 || if int(cClientsLen) == 0 || int(cCookiesLen) == 0 ||
int(c_addrs_len) == 0 { int(cAddrsLen) == 0 {
lockers = make([]Locker, 0) lockers = make([]Locker, 0)
return "", lockers, nil return "", lockers, nil
} }
tag_buf := make([]byte, c_tag_len) tagBuf := make([]byte, cTagLen)
clients_buf := make([]byte, c_clients_len) clientsBuf := make([]byte, cClientsLen)
cookies_buf := make([]byte, c_cookies_len) cookiesBuf := make([]byte, cCookiesLen)
addrs_buf := make([]byte, c_addrs_len) addrsBuf := make([]byte, cAddrsLen)
c_locker_cnt = C.rbd_list_lockers(image.image, &c_exclusive, cLockerCount = C.rbd_list_lockers(image.image, &cExclusive,
(*C.char)(unsafe.Pointer(&tag_buf[0])), (*C.size_t)(&c_tag_len), (*C.char)(unsafe.Pointer(&tagBuf[0])), (*C.size_t)(&cTagLen),
(*C.char)(unsafe.Pointer(&clients_buf[0])), (*C.size_t)(&c_clients_len), (*C.char)(unsafe.Pointer(&clientsBuf[0])), (*C.size_t)(&cClientsLen),
(*C.char)(unsafe.Pointer(&cookies_buf[0])), (*C.size_t)(&c_cookies_len), (*C.char)(unsafe.Pointer(&cookiesBuf[0])), (*C.size_t)(&cCookiesLen),
(*C.char)(unsafe.Pointer(&addrs_buf[0])), (*C.size_t)(&c_addrs_len)) (*C.char)(unsafe.Pointer(&addrsBuf[0])), (*C.size_t)(&cAddrsLen))
// rbd_list_lockers returns negative value for errors // rbd_list_lockers returns negative value for errors
// and *0* means no locker held on rbd image. // and *0* means no locker held on rbd image.
// but *0* is unexpected here because first rbd_list_lockers already // but *0* is unexpected here because first rbd_list_lockers already
// dealt with no locker case // dealt with no locker case
if int(c_locker_cnt) <= 0 { if int(cLockerCount) <= 0 {
return "", nil, rbdError(c_locker_cnt) return "", nil, rbdError(cLockerCount)
} }
clients := cutil.SplitSparseBuffer(clients_buf) clients := cutil.SplitSparseBuffer(clientsBuf)
cookies := cutil.SplitSparseBuffer(cookies_buf) cookies := cutil.SplitSparseBuffer(cookiesBuf)
addrs := cutil.SplitSparseBuffer(addrs_buf) addrs := cutil.SplitSparseBuffer(addrsBuf)
lockers = make([]Locker, c_locker_cnt) lockers = make([]Locker, cLockerCount)
for i := 0; i < int(c_locker_cnt); i++ { for i := 0; i < int(cLockerCount); i++ {
lockers[i] = Locker{Client: clients[i], lockers[i] = Locker{Client: clients[i],
Cookie: cookies[i], Cookie: cookies[i],
Addr: addrs[i]} Addr: addrs[i]}
} }
return string(tag_buf), lockers, nil return string(tagBuf), lockers, nil
} }
// LockExclusive acquires an exclusive lock on the rbd image. // LockExclusive acquires an exclusive lock on the rbd image.