[release-branch.go1.24] os: allow direntries to have zero inodes on Linux

Some Linux filesystems have been known to return valid enties with
zero inodes. This new behavior also puts Go in agreement with recent
glibc.

Fixes #76624

Change-Id: Ieaf50739a294915a3ea2ef8c5a3bb2a91a186881
GitHub-Last-Rev: 8f83d009ef0320fd3fe7cf03e55d5d24df57f015
GitHub-Pull-Request: golang/go#76448
Reviewed-on: https://go-review.googlesource.com/c/go/+/724220
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Auto-Submit: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-on: https://go-review.googlesource.com/c/go/+/725341

diff --git a/src/os/dir_unix.go b/src/os/dir_unix.go
index eadc1660c212eabca5e26ae6ae3d887190811b23..17c579912697d613e5cf41ae8b3d27c3ce3fa431 100644 (file)
--- a/src/os/dir_unix.go
+++ b/src/os/dir_unix.go
@@ -104,7 +104,8 @@ func (f *File) readdir(n int, mode readdirMode) (names []string, dirents []DirEn
                // or might expose a remote file system which does not have the concept
                // of inodes. Therefore, we cannot make the assumption that it is safe
                // to skip entries with zero inodes.
-               if ino == 0 && runtime.GOOS != "wasip1" {
+               // Some Linux filesystems (old XFS, FUSE) can return valid files with zero inodes.
+               if ino == 0 && runtime.GOOS != "linux" && runtime.GOOS != "wasip1" {
                        continue
                }
                const namoff = uint64(unsafe.Offsetof(syscall.Dirent{}.Name))

diff --git a/src/syscall/dirent.go b/src/syscall/dirent.go
index f6e78d9bb570e4cbf31ea584d44acaa279656d4e..1c2cf92fc1a6f64be37f7a1cc00d4e445b81a71a 100644 (file)
--- a/src/syscall/dirent.go
+++ b/src/syscall/dirent.go
@@ -73,8 +73,8 @@ func ParseDirent(buf []byte, max int, names []string) (consumed int, count int,
                        break
                }
                // See src/os/dir_unix.go for the reason why this condition is
-               // excluded on wasip1.
-               if ino == 0 && runtime.GOOS != "wasip1" { // File absent in directory.
+               // excluded on wasip1 and linux.
+               if ino == 0 && runtime.GOOS != "linux" && runtime.GOOS != "wasip1" { // File absent in directory.
                        continue
                }
                const namoff = uint64(unsafe.Offsetof(Dirent{}.Name))