diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-10-29 00:04:39 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2019-10-29 00:04:39 -0700 |
| commit | 9d7a4bf93c0d20a7eb2f07ef2ef63834f2cbf6a9 (patch) | |
| tree | a7a38b70b7b7fd61f45f61ccf957cf2f73b0ae89 | |
| parent | 249259376da98d8e10e6876c80ff3905e9756bdc (diff) | |
filesystem: remove Mount.Options
fscrypt doesn't currently do anything with the mount options, so remove
them from the Mount structure for now.
| -rw-r--r-- | filesystem/filesystem.go | 5 | ||||
| -rw-r--r-- | filesystem/mountpoint.go | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 3884e6e..2b3383c 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -66,7 +66,6 @@ var ( // Mount contains information for a specific mounted filesystem. // Path - Absolute path where the directory is mounted // FilesystemType - Type of the mounted filesystem, e.g. "ext4" -// Options - List of options used when mounting the filesystem // Device - Device for filesystem (empty string if we cannot find one) // // In order to use a Mount to store fscrypt metadata, some directories must be @@ -92,7 +91,6 @@ var ( type Mount struct { Path string FilesystemType string - Options []string Device string } @@ -124,8 +122,7 @@ const ( func (m *Mount) String() string { return fmt.Sprintf(`%s FilesystemType: %s - Options: %v - Device: %s`, m.Path, m.FilesystemType, m.Options, m.Device) + Device: %s`, m.Path, m.FilesystemType, m.Device) } // BaseDir returns the path to the base fscrypt directory for this filesystem. diff --git a/filesystem/mountpoint.go b/filesystem/mountpoint.go index 856447f..2905481 100644 --- a/filesystem/mountpoint.go +++ b/filesystem/mountpoint.go @@ -89,7 +89,6 @@ func getMountInfo() error { mnt := Mount{ Path: C.GoString(entry.mnt_dir), FilesystemType: C.GoString(entry.mnt_type), - Options: strings.Split(C.GoString(entry.mnt_opts), ","), } // Skip invalid mountpoints |