diff options
author | baude <bbaude@redhat.com> | 2019-07-11 05:44:12 -0500 |
---|---|---|
committer | baude <bbaude@redhat.com> | 2019-07-21 14:22:39 -0500 |
commit | db826d5d75630cca784bd7092eba5b06601ae27f (patch) | |
tree | c60cc844e499d5d57752fdb92d4036ea0487ae3c /pkg/spec | |
parent | a5aa44c583612e210cf2ba44c3313a2ff27c94da (diff) | |
download | podman-db826d5d75630cca784bd7092eba5b06601ae27f.tar.gz podman-db826d5d75630cca784bd7092eba5b06601ae27f.tar.bz2 podman-db826d5d75630cca784bd7092eba5b06601ae27f.zip |
golangci-lint round #3
this is the third round of preparing to use the golangci-lint on our
code base.
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/spec')
-rw-r--r-- | pkg/spec/config_linux.go | 2 | ||||
-rw-r--r-- | pkg/spec/parse.go | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pkg/spec/config_linux.go b/pkg/spec/config_linux.go index a84e9a72f..60d31d78e 100644 --- a/pkg/spec/config_linux.go +++ b/pkg/spec/config_linux.go @@ -160,7 +160,7 @@ func (c *CreateConfig) addPrivilegedDevices(g *generate.Generator) error { } // Add resources device - need to clear the existing one first. - g.Spec().Linux.Resources.Devices = nil + g.Config.Linux.Resources.Devices = nil g.AddLinuxResourcesDevice(true, "", nil, nil, "rwm") return nil } diff --git a/pkg/spec/parse.go b/pkg/spec/parse.go index d688b8d1b..c2572a033 100644 --- a/pkg/spec/parse.go +++ b/pkg/spec/parse.go @@ -126,13 +126,9 @@ func validateIOpsDevice(val string) (*throttleDevice, error) { //nolint if err != nil { return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>. Number must be a positive integer", val) } - if rate < 0 { - return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>. Number must be a positive integer", val) - } - return &throttleDevice{ path: split[0], - rate: uint64(rate), + rate: rate, }, nil } |