summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fs/fdpipe
diff options
context:
space:
mode:
authorIan Gudger <igudger@google.com>2018-05-08 09:51:07 -0700
committerShentubot <shentubot@google.com>2018-05-08 09:51:56 -0700
commitb4765f782d91443ab0415dc00e727d783632e2ad (patch)
tree82c2b45b7d9fee5ceaf3792e34c5fdf09c69da43 /pkg/sentry/fs/fdpipe
parentd0d01a18963ed7cfc29e5b8334e30b1234b6048b (diff)
Fix warning: redundant if ...; err != nil check, just return error instead.
This warning is produced by golint. PiperOrigin-RevId: 195833381 Change-Id: Idd6a7e57e3cfdf00819f2374b19fc113585dc1e1
Diffstat (limited to 'pkg/sentry/fs/fdpipe')
-rw-r--r--pkg/sentry/fs/fdpipe/pipe.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkg/sentry/fs/fdpipe/pipe.go b/pkg/sentry/fs/fdpipe/pipe.go
index f7bbd4aff..7b318e35f 100644
--- a/pkg/sentry/fs/fdpipe/pipe.go
+++ b/pkg/sentry/fs/fdpipe/pipe.go
@@ -90,10 +90,7 @@ func (p *pipeOperations) init() error {
if err := syscall.SetNonblock(p.file.FD(), true); err != nil {
return err
}
- if err := fdnotifier.AddFD(int32(p.file.FD()), &p.Queue); err != nil {
- return err
- }
- return nil
+ return fdnotifier.AddFD(int32(p.file.FD()), &p.Queue)
}
// EventRegister implements waiter.Waitable.EventRegister.