From cfd26afabe56baf80ce8f13330c58415975b66b9 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 3 Jan 2022 16:51:02 +0100 Subject: [PATCH] Use syscall.Timespec.Unix Use the syscall method instead of repeating the type conversions for the syscall.Stat_t Atim/Mtim members. This also allows to drop the //nolint: unconvert comments. Signed-off-by: Tobias Klauser --- daemon/graphdriver/copy/copy.go | 4 ++-- pkg/system/chtimes_linux_test.go | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/daemon/graphdriver/copy/copy.go b/daemon/graphdriver/copy/copy.go index 9ae30a3696..26d9e44eae 100644 --- a/daemon/graphdriver/copy/copy.go +++ b/daemon/graphdriver/copy/copy.go @@ -228,8 +228,8 @@ func DirCopy(srcDir, dstDir string, copyMode Mode, copyXattrs bool) error { if f.IsDir() { dirsToSetMtimes.PushFront(&dirMtimeInfo{dstPath: &dstPath, stat: stat}) } else if !isSymlink { - aTime := time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec)) - mTime := time.Unix(int64(stat.Mtim.Sec), int64(stat.Mtim.Nsec)) + aTime := time.Unix(stat.Atim.Unix()) + mTime := time.Unix(stat.Mtim.Unix()) if err := system.Chtimes(dstPath, aTime, mTime); err != nil { return err } diff --git a/pkg/system/chtimes_linux_test.go b/pkg/system/chtimes_linux_test.go index 075f573059..97f860443c 100644 --- a/pkg/system/chtimes_linux_test.go +++ b/pkg/system/chtimes_linux_test.go @@ -26,7 +26,7 @@ func TestChtimesLinux(t *testing.T) { } stat := f.Sys().(*syscall.Stat_t) - aTime := time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec)) //nolint: unconvert + aTime := time.Unix(stat.Atim.Unix()) if aTime != unixEpochTime { t.Fatalf("Expected: %s, got: %s", unixEpochTime, aTime) } @@ -40,7 +40,7 @@ func TestChtimesLinux(t *testing.T) { } stat = f.Sys().(*syscall.Stat_t) - aTime = time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec)) //nolint: unconvert + aTime = time.Unix(stat.Atim.Unix()) if aTime != unixEpochTime { t.Fatalf("Expected: %s, got: %s", unixEpochTime, aTime) } @@ -54,7 +54,7 @@ func TestChtimesLinux(t *testing.T) { } stat = f.Sys().(*syscall.Stat_t) - aTime = time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec)) //nolint: unconvert + aTime = time.Unix(stat.Atim.Unix()) if aTime != unixEpochTime { t.Fatalf("Expected: %s, got: %s", unixEpochTime, aTime) } @@ -68,7 +68,7 @@ func TestChtimesLinux(t *testing.T) { } stat = f.Sys().(*syscall.Stat_t) - aTime = time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec)) //nolint: unconvert + aTime = time.Unix(stat.Atim.Unix()) if aTime != afterUnixEpochTime { t.Fatalf("Expected: %s, got: %s", afterUnixEpochTime, aTime) } @@ -82,7 +82,7 @@ func TestChtimesLinux(t *testing.T) { } stat = f.Sys().(*syscall.Stat_t) - aTime = time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec)) //nolint: unconvert + aTime = time.Unix(stat.Atim.Unix()) if aTime.Truncate(time.Second) != unixMaxTime.Truncate(time.Second) { t.Fatalf("Expected: %s, got: %s", unixMaxTime.Truncate(time.Second), aTime.Truncate(time.Second)) }