Merge pull request #10416 from swagiaal/iscsi-remount

iSCSI Plugin: Remove remounting of device in global path.
This commit is contained in:
Quinton Hoole 2015-09-04 09:05:58 -07:00
commit 8ea1078f6e

View File

@ -165,16 +165,8 @@ func (b *iscsiDiskBuilder) SetUpAt(dir string) error {
err := diskSetUp(b.manager, *b, dir, b.mounter) err := diskSetUp(b.manager, *b, dir, b.mounter)
if err != nil { if err != nil {
glog.Errorf("iscsi: failed to setup") glog.Errorf("iscsi: failed to setup")
return err
} }
globalPDPath := b.manager.MakeGlobalPDName(*b.iscsiDisk) return err
var options []string
if b.readOnly {
options = []string{"remount", "ro"}
} else {
options = []string{"remount", "rw"}
}
return b.mounter.Mount(globalPDPath, dir, "", options)
} }
type iscsiDiskCleaner struct { type iscsiDiskCleaner struct {