github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebased and updated to latest

Browse Source
This commit is contained in:
markturansky
2015-07-24 15:04:03 -04:00
parent 63ccfa2beb
commit 920cb34b1e
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,11 @@ 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
return nil
}
return util.rbdLock(b, true)
@@ -169,7 +173,11 @@ 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
}