devmapper: Disable mount option "discard" by default
| ... | ... |
@@ -1366,11 +1366,7 @@ func (devices *DeviceSet) MountDevice(hash, path, mountLabel string) error {
|
| 1366 | 1366 |
options = joinMountOptions(options, devices.mountOptions) |
| 1367 | 1367 |
options = joinMountOptions(options, label.FormatMountLabel("", mountLabel))
|
| 1368 | 1368 |
|
| 1369 |
- err = syscall.Mount(info.DevName(), path, fstype, flags, joinMountOptions("discard", options))
|
|
| 1370 |
- if err != nil && err == syscall.EINVAL {
|
|
| 1371 |
- err = syscall.Mount(info.DevName(), path, fstype, flags, options) |
|
| 1372 |
- } |
|
| 1373 |
- if err != nil {
|
|
| 1369 |
+ if err := syscall.Mount(info.DevName(), path, fstype, flags, options); err != nil {
|
|
| 1374 | 1370 |
return fmt.Errorf("Error mounting '%s' on '%s': %s", info.DevName(), path, err)
|
| 1375 | 1371 |
} |
| 1376 | 1372 |
|