8115 parallel zfs mount

@@ -23,11 +23,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 #
-# Copyright (c) 2016 by Delphix. All rights reserved.
+# Copyright (c) 2017 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.cfg
 

@@ -82,17 +82,15 @@
         if [[ ! -d $mntpoint ]]; then
                 log_must mkdir -p $mntpoint
         fi
 
         case "$type" in
-                'ctr')  log_must zfs create $pool/$fs
-                        log_must zfs set mountpoint=$mntpoint $pool/$fs
+                'ctr')  log_must zfs create -o mountpoint=$mntpoint $pool/$fs
                         ;;
                 'vol')  log_must zfs create -V $VOLSIZE $pool/$fs
                         ;;
-                *)      log_must zfs create $pool/$fs
-                        log_must zfs set mountpoint=$mntpoint $pool/$fs
+                *)      log_must zfs create -o mountpoint=$mntpoint $pool/$fs
                         ;;
         esac
 
         return 0
 }