fstab: Revert changes & add discard option for /data