summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2019-11-27 15:43:23 +0100
committerSebastiaan van Stijn <github@gone.nl>2019-11-27 15:43:23 +0100
commitec4bc832589046118b6f1332f0a99664c6e42059 (patch)
treefce84eac8acc6e2bd8047999697fe3aa547bca92
parent6625fa61039c31fd03ee88e6cc1435002116c388 (diff)
downloaddocker-ec4bc832589046118b6f1332f0a99664c6e42059.tar.gz
daemon/graphdriver: normalize comment formatting
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
-rw-r--r--daemon/graphdriver/btrfs/btrfs.go2
-rw-r--r--daemon/graphdriver/copy/copy.go2
-rw-r--r--daemon/graphdriver/copy/copy_test.go3
-rw-r--r--daemon/graphdriver/devmapper/deviceset.go6
-rw-r--r--daemon/graphdriver/devmapper/devmapper_test.go2
-rw-r--r--daemon/graphdriver/driver.go2
-rw-r--r--daemon/graphdriver/overlay2/mount.go2
7 files changed, 9 insertions, 10 deletions
diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go
index ec963dcb7f..dfb70a662c 100644
--- a/daemon/graphdriver/btrfs/btrfs.go
+++ b/daemon/graphdriver/btrfs/btrfs.go
@@ -134,7 +134,7 @@ func parseOptions(opt []string) (btrfsOptions, bool, error) {
// Driver contains information about the filesystem mounted.
type Driver struct {
- //root of the file system
+ // root of the file system
home string
uidMaps []idtools.IDMap
gidMaps []idtools.IDMap
diff --git a/daemon/graphdriver/copy/copy.go b/daemon/graphdriver/copy/copy.go
index 7577d0a775..6cb90e86f4 100644
--- a/daemon/graphdriver/copy/copy.go
+++ b/daemon/graphdriver/copy/copy.go
@@ -143,7 +143,7 @@ func DirCopy(srcDir, dstDir string, copyMode Mode, copyXattrs bool) error {
switch mode := f.Mode(); {
case mode.IsRegular():
- //the type is 32bit on mips
+ // the type is 32bit on mips
id := fileID{dev: uint64(stat.Dev), ino: stat.Ino} // nolint: unconvert
if copyMode == Hardlink {
isHardlink = true
diff --git a/daemon/graphdriver/copy/copy_test.go b/daemon/graphdriver/copy/copy_test.go
index 0f3b1670f7..cc5184b503 100644
--- a/daemon/graphdriver/copy/copy_test.go
+++ b/daemon/graphdriver/copy/copy_test.go
@@ -67,8 +67,7 @@ func TestCopyDir(t *testing.T) {
if srcFileSys.Dev == dstFileSys.Dev {
assert.Check(t, srcFileSys.Ino != dstFileSys.Ino)
}
- // Todo: check size, and ctim is not equal
- /// on filesystems that have granular ctimes
+ // Todo: check size, and ctim is not equal on filesystems that have granular ctimes
assert.Check(t, is.DeepEqual(srcFileSys.Mode, dstFileSys.Mode))
assert.Check(t, is.DeepEqual(srcFileSys.Uid, dstFileSys.Uid))
assert.Check(t, is.DeepEqual(srcFileSys.Gid, dstFileSys.Gid))
diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go
index 24084bb89c..023fb9dcaa 100644
--- a/daemon/graphdriver/devmapper/deviceset.go
+++ b/daemon/graphdriver/devmapper/deviceset.go
@@ -119,7 +119,7 @@ type DeviceSet struct {
deletionWorkerTicker *time.Ticker
uidMaps []idtools.IDMap
gidMaps []idtools.IDMap
- minFreeSpacePercent uint32 //min free space percentage in thinpool
+ minFreeSpacePercent uint32 // min free space percentage in thinpool
xfsNospaceRetries string // max retries when xfs receives ENOSPC
lvmSetupConfig directLVMConfig
}
@@ -1692,8 +1692,8 @@ func (devices *DeviceSet) initDevmapper(doInit bool) (retErr error) {
}
}
- //create the root dir of the devmapper driver ownership to match this
- //daemon's remapped root uid/gid so containers can start properly
+ // create the root dir of the devmapper driver ownership to match this
+ // daemon's remapped root uid/gid so containers can start properly
uid, gid, err := idtools.GetRootUIDGID(devices.uidMaps, devices.gidMaps)
if err != nil {
return err
diff --git a/daemon/graphdriver/devmapper/devmapper_test.go b/daemon/graphdriver/devmapper/devmapper_test.go
index 7efd0f287c..afd6c5b4d9 100644
--- a/daemon/graphdriver/devmapper/devmapper_test.go
+++ b/daemon/graphdriver/devmapper/devmapper_test.go
@@ -110,7 +110,7 @@ func testChangeLoopBackSize(t *testing.T, delta, expectDataSize, expectMetaDataS
if err := driver.Cleanup(); err != nil {
t.Fatal(err)
}
- //Reload
+ // Reload
d, err := Init(driver.home, []string{
fmt.Sprintf("dm.loopdatasize=%d", defaultDataLoopbackSize+delta),
fmt.Sprintf("dm.loopmetadatasize=%d", defaultMetaDataLoopbackSize+delta),
diff --git a/daemon/graphdriver/driver.go b/daemon/graphdriver/driver.go
index 44434f7dcd..a9e8ce4c91 100644
--- a/daemon/graphdriver/driver.go
+++ b/daemon/graphdriver/driver.go
@@ -29,7 +29,7 @@ var (
drivers map[string]InitFunc
)
-//CreateOpts contains optional arguments for Create() and CreateReadWrite()
+// CreateOpts contains optional arguments for Create() and CreateReadWrite()
// methods.
type CreateOpts struct {
MountLabel string
diff --git a/daemon/graphdriver/overlay2/mount.go b/daemon/graphdriver/overlay2/mount.go
index da409fc81a..de573deba1 100644
--- a/daemon/graphdriver/overlay2/mount.go
+++ b/daemon/graphdriver/overlay2/mount.go
@@ -53,7 +53,7 @@ func mountFrom(dir, device, target, mType string, flags uintptr, label string) e
w.Close()
return fmt.Errorf("mountfrom error on re-exec cmd: %v", err)
}
- //write the options to the pipe for the untar exec to read
+ // write the options to the pipe for the untar exec to read
if err := json.NewEncoder(w).Encode(options); err != nil {
w.Close()
return fmt.Errorf("mountfrom json encode to pipe failed: %v", err)