Skip to content

Commit

Permalink
fs: Statfs_t{} doesn't have a Type field on NetBSD, OpenBSD, or Solar…
Browse files Browse the repository at this point in the history
…is (#523)

Other projects that import procfs, like node_exporter, apparently build
for OSs that don't have Statfs_t.Type.

Signed-off-by: Dan Williams <dcbw@redhat.com>
  • Loading branch information
dcbw committed May 20, 2023
1 parent 7acd99d commit 58149ca
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 14 deletions.
14 changes: 0 additions & 14 deletions fs.go
Expand Up @@ -14,8 +14,6 @@
package procfs

import (
"syscall"

"github.com/prometheus/procfs/internal/fs"
)

Expand Down Expand Up @@ -50,15 +48,3 @@ func NewFS(mountPoint string) (FS, error) {

return FS{fs, real}, nil
}

// isRealProc determines whether supplied mountpoint is really a proc filesystem.
func isRealProc(mountPoint string) (bool, error) {
stat := syscall.Statfs_t{}
err := syscall.Statfs(mountPoint, &stat)
if err != nil {
return false, err
}

// 0x9fa0 is PROC_SUPER_MAGIC: https://elixir.bootlin.com/linux/v6.1/source/include/uapi/linux/magic.h#L87
return stat.Type == 0x9fa0, nil
}
23 changes: 23 additions & 0 deletions fs_statfs_notype.go
@@ -0,0 +1,23 @@
// Copyright 2018 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build netbsd || openbsd || solaris
// +build netbsd openbsd solaris

package procfs

// isRealProc returns true on architectures that don't have a Type argument
// in their Statfs_t struct
func isRealProc(mountPoint string) (bool, error) {
return true, nil
}
33 changes: 33 additions & 0 deletions fs_statfs_type.go
@@ -0,0 +1,33 @@
// Copyright 2018 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build !netbsd && !openbsd && !solaris
// +build !netbsd,!openbsd,!solaris

package procfs

import (
"syscall"
)

// isRealProc determines whether supplied mountpoint is really a proc filesystem.
func isRealProc(mountPoint string) (bool, error) {
stat := syscall.Statfs_t{}
err := syscall.Statfs(mountPoint, &stat)
if err != nil {
return false, err
}

// 0x9fa0 is PROC_SUPER_MAGIC: https://elixir.bootlin.com/linux/v6.1/source/include/uapi/linux/magic.h#L87
return stat.Type == 0x9fa0, nil
}

0 comments on commit 58149ca

Please sign in to comment.