diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-10-29 18:32:09 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-10-29 18:32:09 +0000 |
| commit | 862aefb66429be48e5910f72c8e1bc3b6b78e6f4 (patch) | |
| tree | 47973f155ef5712a382be888bdf44fca20de9451 | |
| parent | a6d4910f452bcac488ba71d3b9aac89c97ee32bc (diff) | |
| parent | 8b04e2dd8bb1afddf88c7f68949364b66afb8df5 (diff) | |
Merge release-20190806.1-336-g8b04e2d (automated)
| -rw-r--r-- | pkg/p9/p9.go | 2 | ||||
| -rw-r--r-- | runsc/fsgofer/fsgofer.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/p9/p9.go b/pkg/p9/p9.go index 25530adca..6039f5a42 100644 --- a/pkg/p9/p9.go +++ b/pkg/p9/p9.go @@ -814,7 +814,7 @@ func StatToAttr(s *syscall.Stat_t, req AttrMask) (Attr, AttrMask) { attr.Mode = FileMode(s.Mode) } if req.NLink { - attr.NLink = s.Nlink + attr.NLink = uint64(s.Nlink) } if req.UID { attr.UID = UID(s.Uid) diff --git a/runsc/fsgofer/fsgofer.go b/runsc/fsgofer/fsgofer.go index 3fceecb3d..18b853e2e 100644 --- a/runsc/fsgofer/fsgofer.go +++ b/runsc/fsgofer/fsgofer.go @@ -601,7 +601,7 @@ func (l *localFile) GetAttr(_ p9.AttrMask) (p9.QID, p9.AttrMask, p9.Attr, error) Mode: p9.FileMode(stat.Mode), UID: p9.UID(stat.Uid), GID: p9.GID(stat.Gid), - NLink: stat.Nlink, + NLink: uint64(stat.Nlink), RDev: stat.Rdev, Size: uint64(stat.Size), BlockSize: uint64(stat.Blksize), |