kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

parseStorageOpt: return size rather than updating devInfo.Size field

Browse source 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
This commit is contained in:
Shishir Mahajan 2016-04-01 15:05:09 -04:00
parent 517c18ff2b
commit 45dc5b46e2
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
daemon/graphdriver/devmapper/deviceset.go
View file

@ -1862,26 +1862,25 @@ func (devices *DeviceSet) AddDevice(hash, baseHash string, storageOpt map[string
return fmt.Errorf("devmapper: device %s already exists. Deleted=%v", hash, info.Deleted) return fmt.Errorf("devmapper: device %s already exists. Deleted=%v", hash, info.Deleted)
} }
devinfo := &devInfo{} size, err := devices.parseStorageOpt(storageOpt)
if err != nil {
if err := devices.parseStorageOpt(storageOpt, devinfo); err != nil {
return err return err
} }
if devinfo.Size == 0 { if size == 0 {
devinfo.Size = baseInfo.Size size = baseInfo.Size
} }
if devinfo.Size < baseInfo.Size { if size < baseInfo.Size {
return fmt.Errorf("devmapper: Container size cannot be smaller than %s", units.HumanSize(float64(baseInfo.Size))) return fmt.Errorf("devmapper: Container size cannot be smaller than %s", units.HumanSize(float64(baseInfo.Size)))
} }
if err := devices.createRegisterSnapDevice(hash, baseInfo, devinfo.Size); err != nil { if err := devices.createRegisterSnapDevice(hash, baseInfo, size); err != nil {
return err return err
} }
// Grow the container rootfs. // Grow the container rootfs.
if devinfo.Size > 0 { if size > 0 {
info, err := devices.lookupDevice(hash) info, err := devices.lookupDevice(hash)
if err != nil { if err != nil {
return err return err
@ -1895,7 +1894,7 @@ func (devices *DeviceSet) AddDevice(hash, baseHash string, storageOpt map[string
return nil return nil
} }
func (devices *DeviceSet) parseStorageOpt(storageOpt map[string]string, devinfo *devInfo) error { func (devices *DeviceSet) parseStorageOpt(storageOpt map[string]string) (uint64, error) {
// Read size to change the block device size per container. // Read size to change the block device size per container.
for key, val := range storageOpt { for key, val := range storageOpt {
@ -1904,15 +1903,15 @@ func (devices *DeviceSet) parseStorageOpt(storageOpt map[string]string, devinfo
case "size": case "size":
size, err := units.RAMInBytes(val) size, err := units.RAMInBytes(val)
if err != nil { if err != nil {
return err return 0, err
} }
devinfo.Size = uint64(size) return uint64(size), nil
default: default:
return fmt.Errorf("Unknown option %s", key) return 0, fmt.Errorf("Unknown option %s", key)
} }
} }
return nil return 0, nil
} }
func (devices *DeviceSet) markForDeferredDeletion(info *devInfo) error { func (devices *DeviceSet) markForDeferredDeletion(info *devInfo) error {