Imported Upstream version 0.6.5.9

[mirror_zfs-debian.git] / lib / libzfs / libzfs_mount.c

diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c
index bd874e480f811a8813135e82eb246feafefbce4f..4c4f8822c242c68e263234fe08ccd099771cf201 100644 (file)
--- a/lib/libzfs/libzfs_mount.c
+++ b/lib/libzfs/libzfs_mount.c
@@ -364,6 +364,14 @@ zfs_add_options(zfs_handle_t *zhp, char *options, int len)
 
        error = zfs_add_option(zhp, options, len,
            ZFS_PROP_ATIME, MNTOPT_ATIME, MNTOPT_NOATIME);
+       /*
+        * don't add relatime/strictatime when atime=off, otherwise strictatime
+        * will force atime=on
+        */
+       if (strstr(options, MNTOPT_NOATIME) == NULL) {
+               error = zfs_add_option(zhp, options, len,
+                   ZFS_PROP_RELATIME, MNTOPT_RELATIME, MNTOPT_STRICTATIME);
+       }
        error = error ? error : zfs_add_option(zhp, options, len,
            ZFS_PROP_DEVICES, MNTOPT_DEVICES, MNTOPT_NODEVICES);
        error = error ? error : zfs_add_option(zhp, options, len,