Merge pull request #36392 from yongtang/02232018-golint

Golint fix up
Upstream-commit: 4d9beb4607404e4d756052aca7041517788f7e75
Component: engine

components/engine/daemon/graphdriver/btrfs/btrfs.go

@@ -158,11 +158,7 @@ func (d *Driver) GetMetadata(id string) (map[string]string, error) {
 
 // Cleanup unmounts the home directory.
 func (d *Driver) Cleanup() error {
-	if err := d.subvolDisableQuota(); err != nil {
-		return err
-	}
-
-	return nil
+	return d.subvolDisableQuota()
 }
 
 func free(p *C.char) {