From 79240b9eafa08001912d5b360a654b1ad9cd1d20 Mon Sep 17 00:00:00 2001
From: Phil Estes <estesp@linux.vnet.ibm.com>
Date: Mon, 12 Oct 2015 10:58:33 -0400
Subject: [PATCH] Correct mismatched function names (UID() and Gid())

All the go-lint work forced any existing "Uid" -> "UID", but seems to
not have the same rules for Gid, so stat package has calls UID() and
Gid().

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
---
 daemon/volumes_unix.go                          | 2 +-
 integration-cli/docker_cli_experimental_test.go | 2 +-
 pkg/archive/changes_unix.go                     | 2 +-
 pkg/system/stat.go                              | 4 ++--
 pkg/system/stat_unix_test.go                    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/daemon/volumes_unix.go b/daemon/volumes_unix.go
index b860aa30f..3b32c65f9 100644
--- a/daemon/volumes_unix.go
+++ b/daemon/volumes_unix.go
@@ -28,7 +28,7 @@ func copyOwnership(source, destination string) error {
 		return err
 	}
 
-	if err := os.Chown(destination, int(stat.UID()), int(stat.Gid())); err != nil {
+	if err := os.Chown(destination, int(stat.UID()), int(stat.GID())); err != nil {
 		return err
 	}
 
diff --git a/integration-cli/docker_cli_experimental_test.go b/integration-cli/docker_cli_experimental_test.go
index e0ed4c76c..8cbb1bb3f 100644
--- a/integration-cli/docker_cli_experimental_test.go
+++ b/integration-cli/docker_cli_experimental_test.go
@@ -80,5 +80,5 @@ func (s *DockerDaemonSuite) TestDaemonUserNamespaceRootSetting(c *check.C) {
 		c.Fatal(err)
 	}
 	c.Assert(stat.UID(), check.Equals, uint32(uid), check.Commentf("Touched file not owned by remapped root UID"))
-	c.Assert(stat.Gid(), check.Equals, uint32(gid), check.Commentf("Touched file not owned by remapped root GID"))
+	c.Assert(stat.GID(), check.Equals, uint32(gid), check.Commentf("Touched file not owned by remapped root GID"))
 }
diff --git a/pkg/archive/changes_unix.go b/pkg/archive/changes_unix.go
index a2ccbb258..05f109afa 100644
--- a/pkg/archive/changes_unix.go
+++ b/pkg/archive/changes_unix.go
@@ -12,7 +12,7 @@ func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool {
 	// Don't look at size for dirs, its not a good measure of change
 	if oldStat.Mode() != newStat.Mode() ||
 		oldStat.UID() != newStat.UID() ||
-		oldStat.Gid() != newStat.Gid() ||
+		oldStat.GID() != newStat.GID() ||
 		oldStat.Rdev() != newStat.Rdev() ||
 		// Don't look at size for dirs, its not a good measure of change
 		(oldStat.Mode()&syscall.S_IFDIR != syscall.S_IFDIR &&
diff --git a/pkg/system/stat.go b/pkg/system/stat.go
index 7392c8202..087034c5e 100644
--- a/pkg/system/stat.go
+++ b/pkg/system/stat.go
@@ -27,8 +27,8 @@ func (s StatT) UID() uint32 {
 	return s.uid
 }
 
-// Gid returns file's group id of owner.
-func (s StatT) Gid() uint32 {
+// GID returns file's group id of owner.
+func (s StatT) GID() uint32 {
 	return s.gid
 }
 
diff --git a/pkg/system/stat_unix_test.go b/pkg/system/stat_unix_test.go
index 8b3c42b73..dee8d30a1 100644
--- a/pkg/system/stat_unix_test.go
+++ b/pkg/system/stat_unix_test.go
@@ -27,7 +27,7 @@ func TestFromStatT(t *testing.T) {
 	if stat.Uid != s.UID() {
 		t.Fatal("got invalid uid")
 	}
-	if stat.Gid != s.Gid() {
+	if stat.Gid != s.GID() {
 		t.Fatal("got invalid gid")
 	}
 	if stat.Rdev != s.Rdev() {