From bfd9f75ba4390de824d2c3d44c15bdca9dd0ff35 Mon Sep 17 00:00:00 2001 From: Nicolas Lacasse Date: Wed, 8 May 2019 14:34:01 -0700 Subject: Set the FilesytemType in MountSource from the Filesystem. And stop storing the Filesystem in the MountSource. This allows us to decouple the MountSource filesystem type from the name of the filesystem. PiperOrigin-RevId: 247292982 Change-Id: I49cbcce3c17883b7aa918ba76203dfd6d1b03cc8 --- pkg/sentry/fs/mount.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkg/sentry/fs/mount.go') diff --git a/pkg/sentry/fs/mount.go b/pkg/sentry/fs/mount.go index a169ea4c9..9740f1fc6 100644 --- a/pkg/sentry/fs/mount.go +++ b/pkg/sentry/fs/mount.go @@ -110,9 +110,8 @@ type MountSource struct { // MountSourceOperations defines filesystem specific behavior. MountSourceOperations - // Filesystem is the filesystem backing the mount. Can be nil if there - // is no filesystem backing the mount. - Filesystem Filesystem + // FilesystemType is the type of the filesystem backing this mount. + FilesystemType string // Flags are the flags that this filesystem was mounted with. Flags MountSourceFlags @@ -158,10 +157,14 @@ const DefaultDirentCacheSize uint64 = 1000 // NewMountSource returns a new MountSource. Filesystem may be nil if there is no // filesystem backing the mount. func NewMountSource(mops MountSourceOperations, filesystem Filesystem, flags MountSourceFlags) *MountSource { + fsType := "none" + if filesystem != nil { + fsType = filesystem.Name() + } return &MountSource{ MountSourceOperations: mops, Flags: flags, - Filesystem: filesystem, + FilesystemType: fsType, fscache: NewDirentCache(DefaultDirentCacheSize), children: make(map[*MountSource]struct{}), } -- cgit v1.2.3