opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-02 02:26:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

golangci-lint pass number 2

Browse Source 
clean up and prepare to migrate to the golangci-linter

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2019-07-10 13:14:17 -05:00
parent e2e8477f83
commit a78c885397
30 changed files with 140 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/rootless/rootless_linux.go
View File

@ -220,7 +220,11 @@ func EnableLinger() (string, error) {
conn, err := dbus.SystemBus()
if err == nil {
defer conn.Close()
defer func() {
if err := conn.Close(); err != nil {
logrus.Errorf("unable to close dbus connection: %q", err)
}
}()
}
lingerEnabled := false
@ -310,13 +314,21 @@ func joinUserAndMountNS(pid uint, pausePid string) (bool, int, error) {
if err != nil {
return false, -1, err
}
defer userNS.Close()
defer func() {
if err := userNS.Close(); err != nil {
logrus.Errorf("unable to close namespace: %q", err)
}
}()
mountNS, err := os.Open(fmt.Sprintf("/proc/%d/ns/mnt", pid))
if err != nil {
return false, -1, err
}
defer userNS.Close()
defer func() {
if err := mountNS.Close(); err != nil {
logrus.Errorf("unable to close namespace: %q", err)
}
}()
fd, err := getUserNSFirstChild(userNS.Fd())
if err != nil {
@ -364,7 +376,11 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (bool,
defer errorhandling.CloseQuiet(r)
defer errorhandling.CloseQuiet(w)
defer w.Write([]byte("0"))
defer func() {
if _, err := w.Write([]byte("0")); err != nil {
logrus.Errorf("failed to write byte 0: %q", err)
}
}()
pidC := C.reexec_in_user_namespace(C.int(r.Fd()), cPausePid, cFileToRead, fileOutputFD)
pid := int(pidC)