github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

rebased and updated

Browse Source
This commit is contained in:
markturansky
2015-07-27 16:33:22 -04:00
parent 920cb34b1e
commit 8639f24374
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/volume/rbd/rbd_util.go
View File

@@ -161,11 +161,7 @@ func (util *RBDUtil) loadRBD(rbd *rbd, mnt string) error {
func (util *RBDUtil) fencing(b rbdBuilder) error {
// no need to fence readOnly
<<<<<<< HEAD
if b.ReadOnly {
=======
if rbd.readOnly {
>>>>>>> rebased and updated to latest
if b.IsReadOnly() {
return nil
}
return util.rbdLock(b, true)
@@ -173,11 +169,7 @@ func (util *RBDUtil) fencing(b rbdBuilder) error {
func (util *RBDUtil) defencing(c rbdCleaner) error {
// no need to fence readOnly
<<<<<<< HEAD
if c.ReadOnly {
=======
if rbd.readOnly {
>>>>>>> rebased and updated to latest
return nil
}