diff --git a/daemon/graphdriver/devmapper/attach_loopback.go b/daemon/graphdriver/devmapper/attach_loopback.go index 23339076e..d2ab8c3a4 100644 --- a/daemon/graphdriver/devmapper/attach_loopback.go +++ b/daemon/graphdriver/devmapper/attach_loopback.go @@ -4,6 +4,9 @@ package devmapper import ( "fmt" + "os" + "syscall" + "github.com/dotcloud/docker/utils" ) @@ -14,7 +17,7 @@ func stringToLoopName(src string) [LoNameSize]uint8 { } func getNextFreeLoopbackIndex() (int, error) { - f, err := osOpenFile("/dev/loop-control", osORdOnly, 0644) + f, err := os.OpenFile("/dev/loop-control", os.O_RDONLY, 0644) if err != nil { return 0, err } @@ -27,27 +30,27 @@ func getNextFreeLoopbackIndex() (int, error) { return index, err } -func openNextAvailableLoopback(index int, sparseFile *osFile) (loopFile *osFile, err error) { +func openNextAvailableLoopback(index int, sparseFile *os.File) (loopFile *os.File, err error) { // Start looking for a free /dev/loop for { target := fmt.Sprintf("/dev/loop%d", index) index++ - fi, err := osStat(target) + fi, err := os.Stat(target) if err != nil { - if osIsNotExist(err) { + if os.IsNotExist(err) { utils.Errorf("There are no more loopback device available.") } return nil, ErrAttachLoopbackDevice } - if fi.Mode()&osModeDevice != osModeDevice { + if fi.Mode()&os.ModeDevice != os.ModeDevice { utils.Errorf("Loopback device %s is not a block device.", target) continue } // OpenFile adds O_CLOEXEC - loopFile, err = osOpenFile(target, osORdWr, 0644) + loopFile, err = os.OpenFile(target, os.O_RDWR, 0644) if err != nil { utils.Errorf("Error openning loopback device: %s", err) return nil, ErrAttachLoopbackDevice @@ -58,7 +61,7 @@ func openNextAvailableLoopback(index int, sparseFile *osFile) (loopFile *osFile, loopFile.Close() // If the error is EBUSY, then try the next loopback - if err != sysEBusy { + if err != syscall.EBUSY { utils.Errorf("Cannot set up loopback device %s: %s", target, err) return nil, ErrAttachLoopbackDevice } @@ -80,8 +83,8 @@ func openNextAvailableLoopback(index int, sparseFile *osFile) (loopFile *osFile, } // attachLoopDevice attaches the given sparse file to the next -// available loopback device. It returns an opened *osFile. -func attachLoopDevice(sparseName string) (loop *osFile, err error) { +// available loopback device. It returns an opened *os.File. +func attachLoopDevice(sparseName string) (loop *os.File, err error) { // Try to retrieve the next available loopback device via syscall. // If it fails, we discard error and start loopking for a @@ -92,7 +95,7 @@ func attachLoopDevice(sparseName string) (loop *osFile, err error) { } // OpenFile adds O_CLOEXEC - sparseFile, err := osOpenFile(sparseName, osORdWr, 0644) + sparseFile, err := os.OpenFile(sparseName, os.O_RDWR, 0644) if err != nil { utils.Errorf("Error openning sparse file %s: %s", sparseName, err) return nil, ErrAttachLoopbackDevice diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index 79563c108..744f1e11b 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -8,6 +8,8 @@ import ( "fmt" "io" "io/ioutil" + "os" + "os/exec" "path" "path/filepath" "strconv" @@ -135,7 +137,7 @@ func (devices *DeviceSet) hasImage(name string) bool { dirname := devices.loopbackDir() filename := path.Join(dirname, name) - _, err := osStat(filename) + _, err := os.Stat(filename) return err == nil } @@ -147,16 +149,16 @@ func (devices *DeviceSet) ensureImage(name string, size int64) (string, error) { dirname := devices.loopbackDir() filename := path.Join(dirname, name) - if err := osMkdirAll(dirname, 0700); err != nil && !osIsExist(err) { + if err := os.MkdirAll(dirname, 0700); err != nil && !os.IsExist(err) { return "", err } - if _, err := osStat(filename); err != nil { - if !osIsNotExist(err) { + if _, err := os.Stat(filename); err != nil { + if !os.IsNotExist(err) { return "", err } utils.Debugf("Creating loopback file %s for device-manage use", filename) - file, err := osOpenFile(filename, osORdWr|osOCreate, 0600) + file, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, 0600) if err != nil { return "", err } @@ -175,7 +177,7 @@ func (devices *DeviceSet) allocateTransactionId() uint64 { } func (devices *DeviceSet) removeMetadata(info *DevInfo) error { - if err := osRemoveAll(devices.metadataFile(info)); err != nil { + if err := os.RemoveAll(devices.metadataFile(info)); err != nil { return fmt.Errorf("Error removing metadata file %s: %s", devices.metadataFile(info), err) } return nil @@ -204,7 +206,7 @@ func (devices *DeviceSet) saveMetadata(info *DevInfo) error { if err := tmpFile.Close(); err != nil { return fmt.Errorf("Error closing metadata file %s: %s", tmpFile.Name(), err) } - if err := osRename(tmpFile.Name(), devices.metadataFile(info)); err != nil { + if err := os.Rename(tmpFile.Name(), devices.metadataFile(info)); err != nil { return fmt.Errorf("Error committing metadata file %s: %s", tmpFile.Name(), err) } @@ -271,9 +273,9 @@ func (devices *DeviceSet) activateDeviceIfNeeded(info *DevInfo) error { func (devices *DeviceSet) createFilesystem(info *DevInfo) error { devname := info.DevName() - err := execRun("mkfs.ext4", "-E", "discard,lazy_itable_init=0,lazy_journal_init=0", devname) + err := exec.Command("mkfs.ext4", "-E", "discard,lazy_itable_init=0,lazy_journal_init=0", devname).Run() if err != nil { - err = execRun("mkfs.ext4", "-E", "discard,lazy_itable_init=0", devname) + err = exec.Command("mkfs.ext4", "-E", "discard,lazy_itable_init=0", devname).Run() } if err != nil { utils.Debugf("\n--->Err: %s\n", err) @@ -298,7 +300,7 @@ func (devices *DeviceSet) initMetaData() error { // Migrate old metadatafile jsonData, err := ioutil.ReadFile(devices.oldMetadataFile()) - if err != nil && !osIsNotExist(err) { + if err != nil && !os.IsNotExist(err) { utils.Debugf("\n--->Err: %s\n", err) return err } @@ -319,7 +321,7 @@ func (devices *DeviceSet) initMetaData() error { devices.saveMetadata(info) } } - if err := osRename(devices.oldMetadataFile(), devices.oldMetadataFile()+".migrated"); err != nil { + if err := os.Rename(devices.oldMetadataFile(), devices.oldMetadataFile()+".migrated"); err != nil { return err } @@ -408,11 +410,11 @@ func (devices *DeviceSet) setupBaseImage() error { func setCloseOnExec(name string) { if fileInfos, _ := ioutil.ReadDir("/proc/self/fd"); fileInfos != nil { for _, i := range fileInfos { - link, _ := osReadlink(filepath.Join("/proc/self/fd", i.Name())) + link, _ := os.Readlink(filepath.Join("/proc/self/fd", i.Name())) if link == name { fd, err := strconv.Atoi(i.Name()) if err == nil { - sysCloseOnExec(fd) + syscall.CloseOnExec(fd) } } } @@ -440,7 +442,7 @@ func (devices *DeviceSet) ResizePool(size int64) error { datafilename := path.Join(dirname, "data") metadatafilename := path.Join(dirname, "metadata") - datafile, err := osOpenFile(datafilename, osORdWr, 0) + datafile, err := os.OpenFile(datafilename, os.O_RDWR, 0) if datafile == nil { return err } @@ -461,7 +463,7 @@ func (devices *DeviceSet) ResizePool(size int64) error { } defer dataloopback.Close() - metadatafile, err := osOpenFile(metadatafilename, osORdWr, 0) + metadatafile, err := os.OpenFile(metadatafilename, os.O_RDWR, 0) if metadatafile == nil { return err } @@ -504,17 +506,17 @@ func (devices *DeviceSet) ResizePool(size int64) error { func (devices *DeviceSet) initDevmapper(doInit bool) error { logInit(devices) - if err := osMkdirAll(devices.metadataDir(), 0700); err != nil && !osIsExist(err) { + if err := os.MkdirAll(devices.metadataDir(), 0700); err != nil && !os.IsExist(err) { return err } // Set the device prefix from the device id and inode of the docker root dir - st, err := osStat(devices.root) + st, err := os.Stat(devices.root) if err != nil { return fmt.Errorf("Error looking up dir %s: %s", devices.root, err) } - sysSt := toSysStatT(st.Sys()) + sysSt := st.Sys().(*syscall.Stat_t) // "reg-" stands for "regular file". // In the future we might use "dev-" for "device file", etc. // docker-maj,min[-inode] stands for: @@ -845,7 +847,7 @@ func (devices *DeviceSet) Shutdown() error { // We use MNT_DETACH here in case it is still busy in some running // container. This means it'll go away from the global scope directly, // and the device will be released when that container dies. - if err := sysUnmount(info.mountPath, syscall.MNT_DETACH); err != nil { + if err := syscall.Unmount(info.mountPath, syscall.MNT_DETACH); err != nil { utils.Debugf("Shutdown unmounting %s, error: %s\n", info.mountPath, err) } @@ -903,13 +905,13 @@ func (devices *DeviceSet) MountDevice(hash, path, mountLabel string) error { return fmt.Errorf("Error activating devmapper device for '%s': %s", hash, err) } - var flags uintptr = sysMsMgcVal + var flags uintptr = syscall.MS_MGC_VAL mountOptions := label.FormatMountLabel("discard", mountLabel) - err = sysMount(info.DevName(), path, "ext4", flags, mountOptions) - if err != nil && err == sysEInval { + err = syscall.Mount(info.DevName(), path, "ext4", flags, mountOptions) + if err != nil && err == syscall.EINVAL { mountOptions = label.FormatMountLabel("", mountLabel) - err = sysMount(info.DevName(), path, "ext4", flags, mountOptions) + err = syscall.Mount(info.DevName(), path, "ext4", flags, mountOptions) } if err != nil { return fmt.Errorf("Error mounting '%s' on '%s': %s", info.DevName(), path, err) @@ -946,7 +948,7 @@ func (devices *DeviceSet) UnmountDevice(hash string) error { } utils.Debugf("[devmapper] Unmount(%s)", info.mountPath) - if err := sysUnmount(info.mountPath, 0); err != nil { + if err := syscall.Unmount(info.mountPath, 0); err != nil { utils.Debugf("\n--->Err: %s\n", err) return err } diff --git a/daemon/graphdriver/devmapper/devmapper.go b/daemon/graphdriver/devmapper/devmapper.go index 86af653b4..315f0c0db 100644 --- a/daemon/graphdriver/devmapper/devmapper.go +++ b/daemon/graphdriver/devmapper/devmapper.go @@ -5,9 +5,11 @@ package devmapper import ( "errors" "fmt" - "github.com/dotcloud/docker/utils" + "os" "runtime" "syscall" + + "github.com/dotcloud/docker/utils" ) type DevmapperLogger interface { @@ -184,7 +186,7 @@ func (t *Task) GetNextTarget(next uintptr) (nextPtr uintptr, start uint64, start, length, targetType, params } -func getLoopbackBackingFile(file *osFile) (uint64, uint64, error) { +func getLoopbackBackingFile(file *os.File) (uint64, uint64, error) { loopInfo, err := ioctlLoopGetStatus64(file.Fd()) if err != nil { utils.Errorf("Error get loopback backing file: %s\n", err) @@ -193,7 +195,7 @@ func getLoopbackBackingFile(file *osFile) (uint64, uint64, error) { return loopInfo.loDevice, loopInfo.loInode, nil } -func LoopbackSetCapacity(file *osFile) error { +func LoopbackSetCapacity(file *os.File) error { if err := ioctlLoopSetCapacity(file.Fd(), 0); err != nil { utils.Errorf("Error loopbackSetCapacity: %s", err) return ErrLoopbackSetCapacity @@ -201,20 +203,20 @@ func LoopbackSetCapacity(file *osFile) error { return nil } -func FindLoopDeviceFor(file *osFile) *osFile { +func FindLoopDeviceFor(file *os.File) *os.File { stat, err := file.Stat() if err != nil { return nil } - targetInode := stat.Sys().(*sysStatT).Ino - targetDevice := stat.Sys().(*sysStatT).Dev + targetInode := stat.Sys().(*syscall.Stat_t).Ino + targetDevice := stat.Sys().(*syscall.Stat_t).Dev for i := 0; true; i++ { path := fmt.Sprintf("/dev/loop%d", i) - file, err := osOpenFile(path, osORdWr, 0) + file, err := os.OpenFile(path, os.O_RDWR, 0) if err != nil { - if osIsNotExist(err) { + if os.IsNotExist(err) { return nil } @@ -284,7 +286,7 @@ func RemoveDevice(name string) error { return nil } -func GetBlockDeviceSize(file *osFile) (uint64, error) { +func GetBlockDeviceSize(file *os.File) (uint64, error) { size, err := ioctlBlkGetSize64(file.Fd()) if err != nil { utils.Errorf("Error getblockdevicesize: %s", err) @@ -294,7 +296,7 @@ func GetBlockDeviceSize(file *osFile) (uint64, error) { } func BlockDeviceDiscard(path string) error { - file, err := osOpenFile(path, osORdWr, 0) + file, err := os.OpenFile(path, os.O_RDWR, 0) if err != nil { return err } @@ -317,7 +319,7 @@ func BlockDeviceDiscard(path string) error { } // This is the programmatic example of "dmsetup create" -func createPool(poolName string, dataFile, metadataFile *osFile) error { +func createPool(poolName string, dataFile, metadataFile *os.File) error { task, err := createTask(DeviceCreate, poolName) if task == nil { return err @@ -347,7 +349,7 @@ func createPool(poolName string, dataFile, metadataFile *osFile) error { return nil } -func reloadPool(poolName string, dataFile, metadataFile *osFile) error { +func reloadPool(poolName string, dataFile, metadataFile *os.File) error { task, err := createTask(DeviceReload, poolName) if task == nil { return err diff --git a/daemon/graphdriver/devmapper/driver.go b/daemon/graphdriver/devmapper/driver.go index 9f240d96e..609971cda 100644 --- a/daemon/graphdriver/devmapper/driver.go +++ b/daemon/graphdriver/devmapper/driver.go @@ -26,7 +26,7 @@ type Driver struct { home string } -var Init = func(home string) (graphdriver.Driver, error) { +func Init(home string) (graphdriver.Driver, error) { deviceSet, err := NewDeviceSet(home, true) if err != nil { return nil, err @@ -94,7 +94,7 @@ func (d *Driver) Get(id, mountLabel string) (string, error) { mp := path.Join(d.home, "mnt", id) // Create the target directories if they don't exist - if err := osMkdirAll(mp, 0755); err != nil && !osIsExist(err) { + if err := os.MkdirAll(mp, 0755); err != nil && !os.IsExist(err) { return "", err } @@ -104,13 +104,13 @@ func (d *Driver) Get(id, mountLabel string) (string, error) { } rootFs := path.Join(mp, "rootfs") - if err := osMkdirAll(rootFs, 0755); err != nil && !osIsExist(err) { + if err := os.MkdirAll(rootFs, 0755); err != nil && !os.IsExist(err) { d.DeviceSet.UnmountDevice(id) return "", err } idFile := path.Join(mp, "id") - if _, err := osStat(idFile); err != nil && osIsNotExist(err) { + if _, err := os.Stat(idFile); err != nil && os.IsNotExist(err) { // Create an "id" file with the container/image id in it to help reconscruct this in case // of later problems if err := ioutil.WriteFile(idFile, []byte(id), 0600); err != nil { diff --git a/daemon/graphdriver/devmapper/ioctl.go b/daemon/graphdriver/devmapper/ioctl.go index 30bafff94..8f403da2b 100644 --- a/daemon/graphdriver/devmapper/ioctl.go +++ b/daemon/graphdriver/devmapper/ioctl.go @@ -3,11 +3,12 @@ package devmapper import ( + "syscall" "unsafe" ) func ioctlLoopCtlGetFree(fd uintptr) (int, error) { - index, _, err := sysSyscall(sysSysIoctl, fd, LoopCtlGetFree, 0) + index, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, LoopCtlGetFree, 0) if err != 0 { return 0, err } @@ -15,21 +16,21 @@ func ioctlLoopCtlGetFree(fd uintptr) (int, error) { } func ioctlLoopSetFd(loopFd, sparseFd uintptr) error { - if _, _, err := sysSyscall(sysSysIoctl, loopFd, LoopSetFd, sparseFd); err != 0 { + if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, loopFd, LoopSetFd, sparseFd); err != 0 { return err } return nil } func ioctlLoopSetStatus64(loopFd uintptr, loopInfo *LoopInfo64) error { - if _, _, err := sysSyscall(sysSysIoctl, loopFd, LoopSetStatus64, uintptr(unsafe.Pointer(loopInfo))); err != 0 { + if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, loopFd, LoopSetStatus64, uintptr(unsafe.Pointer(loopInfo))); err != 0 { return err } return nil } func ioctlLoopClrFd(loopFd uintptr) error { - if _, _, err := sysSyscall(sysSysIoctl, loopFd, LoopClrFd, 0); err != 0 { + if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, loopFd, LoopClrFd, 0); err != 0 { return err } return nil @@ -38,14 +39,14 @@ func ioctlLoopClrFd(loopFd uintptr) error { func ioctlLoopGetStatus64(loopFd uintptr) (*LoopInfo64, error) { loopInfo := &LoopInfo64{} - if _, _, err := sysSyscall(sysSysIoctl, loopFd, LoopGetStatus64, uintptr(unsafe.Pointer(loopInfo))); err != 0 { + if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, loopFd, LoopGetStatus64, uintptr(unsafe.Pointer(loopInfo))); err != 0 { return nil, err } return loopInfo, nil } func ioctlLoopSetCapacity(loopFd uintptr, value int) error { - if _, _, err := sysSyscall(sysSysIoctl, loopFd, LoopSetCapacity, uintptr(value)); err != 0 { + if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, loopFd, LoopSetCapacity, uintptr(value)); err != 0 { return err } return nil @@ -53,7 +54,7 @@ func ioctlLoopSetCapacity(loopFd uintptr, value int) error { func ioctlBlkGetSize64(fd uintptr) (int64, error) { var size int64 - if _, _, err := sysSyscall(sysSysIoctl, fd, BlkGetSize64, uintptr(unsafe.Pointer(&size))); err != 0 { + if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, BlkGetSize64, uintptr(unsafe.Pointer(&size))); err != 0 { return 0, err } return size, nil @@ -64,7 +65,7 @@ func ioctlBlkDiscard(fd uintptr, offset, length uint64) error { r[0] = offset r[1] = length - if _, _, err := sysSyscall(sysSysIoctl, fd, BlkDiscard, uintptr(unsafe.Pointer(&r[0]))); err != 0 { + if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, BlkDiscard, uintptr(unsafe.Pointer(&r[0]))); err != 0 { return err } return nil diff --git a/daemon/graphdriver/devmapper/mount.go b/daemon/graphdriver/devmapper/mount.go index 4f19109bf..6de9e46c8 100644 --- a/daemon/graphdriver/devmapper/mount.go +++ b/daemon/graphdriver/devmapper/mount.go @@ -3,25 +3,27 @@ package devmapper import ( + "os" "path/filepath" + "syscall" ) // FIXME: this is copy-pasted from the aufs driver. // It should be moved into the core. -var Mounted = func(mountpoint string) (bool, error) { - mntpoint, err := osStat(mountpoint) +func Mounted(mountpoint string) (bool, error) { + mntpoint, err := os.Stat(mountpoint) if err != nil { - if osIsNotExist(err) { + if os.IsNotExist(err) { return false, nil } return false, err } - parent, err := osStat(filepath.Join(mountpoint, "..")) + parent, err := os.Stat(filepath.Join(mountpoint, "..")) if err != nil { return false, err } - mntpointSt := toSysStatT(mntpoint.Sys()) - parentSt := toSysStatT(parent.Sys()) + mntpointSt := mntpoint.Sys().(*syscall.Stat_t) + parentSt := parent.Sys().(*syscall.Stat_t) return mntpointSt.Dev != parentSt.Dev, nil } diff --git a/daemon/graphdriver/devmapper/sys.go b/daemon/graphdriver/devmapper/sys.go deleted file mode 100644 index 5a9ab4d74..000000000 --- a/daemon/graphdriver/devmapper/sys.go +++ /dev/null @@ -1,57 +0,0 @@ -// +build linux,amd64 - -package devmapper - -import ( - "os" - "os/exec" - "syscall" -) - -type ( - sysStatT syscall.Stat_t - sysErrno syscall.Errno - - osFile struct{ *os.File } -) - -var ( - sysMount = syscall.Mount - sysUnmount = syscall.Unmount - sysCloseOnExec = syscall.CloseOnExec - sysSyscall = syscall.Syscall - - osOpenFile = func(name string, flag int, perm os.FileMode) (*osFile, error) { - f, err := os.OpenFile(name, flag, perm) - return &osFile{File: f}, err - } - osOpen = func(name string) (*osFile, error) { f, err := os.Open(name); return &osFile{File: f}, err } - osNewFile = os.NewFile - osCreate = os.Create - osStat = os.Stat - osIsNotExist = os.IsNotExist - osIsExist = os.IsExist - osMkdirAll = os.MkdirAll - osRemoveAll = os.RemoveAll - osRename = os.Rename - osReadlink = os.Readlink - - execRun = func(name string, args ...string) error { return exec.Command(name, args...).Run() } -) - -const ( - sysMsMgcVal = syscall.MS_MGC_VAL - sysMsRdOnly = syscall.MS_RDONLY - sysEInval = syscall.EINVAL - sysSysIoctl = syscall.SYS_IOCTL - sysEBusy = syscall.EBUSY - - osORdOnly = os.O_RDONLY - osORdWr = os.O_RDWR - osOCreate = os.O_CREATE - osModeDevice = os.ModeDevice -) - -func toSysStatT(i interface{}) *sysStatT { - return (*sysStatT)(i.(*syscall.Stat_t)) -}