rebased and updated to latest

pkg/volume/rbd/disk_manager.go

@@ -62,7 +62,11 @@ func diskSetUp(manager diskManager, b rbdBuilder, volPath string, mounter mount.
 	}
 	// Perform a bind mount to the full path to allow duplicate mounts of the same disk.
 	options := []string{"bind"}
+<<<<<<< HEAD
 	if b.ReadOnly {
+=======
+	if disk.readOnly {
+>>>>>>> rebased and updated to latest
 		options = append(options, "ro")
 	}
 	err = mounter.Mount(globalPDPath, volPath, "", options)

pkg/volume/rbd/rbd_util.go

@@ -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
 	}