Fix mount helper

Several issues related to strange mount/umount behavior were reported
and this commit should address most of them.  The original idea was
to put in place a zfs mount helper (mount.zfs).  This helper is used
to enforce 'legacy' mount behavior, and perform any extra mount argument
processing (selinux, zfsutil, etc).  This helper wasn't ready for the
0.6.0-rc1 release but with this change it's functional but needs to
extensively tested.

This change addresses the following open issues.
Closes #101
Closes #107
Closes #113
Closes #115
Closes #119

11 files changed, 1224 insertions, 448 deletions

diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index af03994ce..eaa90d4b9 100644
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS = zfs zpool zpool_id zpool_layout zdb zinject ztest zpios zvol_id
+SUBDIRS  = zfs zpool zdb zinject ztest zpios mount_zfs
+SUBDIRS += zpool_layout zvol_id zpool_id
diff --git a/cmd/Makefile.in b/cmd/Makefile.in
index 2dcf6a659..91200b4ad 100644
--- a/cmd/Makefile.in
+++ b/cmd/Makefile.in
@@ -292,7 +292,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = zfs zpool zpool_id zpool_layout zdb zinject ztest zpios zvol_id
+SUBDIRS = zfs zpool zdb zinject ztest zpios mount_zfs zpool_layout \
+	zvol_id zpool_id
 all: all-recursive
 
 .SUFFIXES:
diff --git a/cmd/mount_zfs/Makefile.am b/cmd/mount_zfs/Makefile.am
new file mode 100644
index 000000000..f5d2db0ba
--- /dev/null
+++ b/cmd/mount_zfs/Makefile.am
@@ -0,0 +1,28 @@
+include $(top_srcdir)/config/Rules.am
+
+DEFAULT_INCLUDES += \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/lib/libspl/include
+
+#
+# Ignore the prefix for the mount helper.  It must be installed in /sbin/
+# because this path is hardcoded in the mount(8) for security reasons.
+#
+sbindir=/sbin
+sbin_PROGRAMS = mount.zfs
+
+mount_zfs_SOURCES = \
+	$(top_srcdir)/cmd/mount_zfs/mount_zfs.c
+
+mount_zfs_LDADD = \
+	$(top_builddir)/lib/libspl/libspl.la \
+	$(top_builddir)/lib/libavl/libavl.la \
+	$(top_builddir)/lib/libefi/libefi.la \
+	$(top_builddir)/lib/libnvpair/libnvpair.la \
+	$(top_builddir)/lib/libunicode/libunicode.la \
+	$(top_builddir)/lib/libuutil/libuutil.la \
+	$(top_builddir)/lib/libzpool/libzpool.la \
+	$(top_builddir)/lib/libzfs/libzfs.la
+
+mount_zfs_LDFLAGS = \
+	-pthread -lm $(ZLIB) -lrt -ldl $(LIBUUID) $(LIBBLKID)
diff --git a/cmd/mount_zfs/Makefile.in b/cmd/mount_zfs/Makefile.in
new file mode 100644
index 000000000..18d3c6e22
--- /dev/null
+++ b/cmd/mount_zfs/Makefile.in
@@ -0,0 +1,664 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/Rules.am
+sbin_PROGRAMS = mount.zfs$(EXEEXT)
+subdir = cmd/mount_zfs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps =  \
+	$(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
+	$(top_srcdir)/config/kernel-bdev-logical-size.m4 \
+	$(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
+	$(top_srcdir)/config/kernel-bio-end-io-t-args.m4 \
+	$(top_srcdir)/config/kernel-bio-failfast.m4 \
+	$(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
+	$(top_srcdir)/config/kernel-blk-end-request.m4 \
+	$(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+	$(top_srcdir)/config/kernel-blk-requeue-request.m4 \
+	$(top_srcdir)/config/kernel-blk-rq-bytes.m4 \
+	$(top_srcdir)/config/kernel-blk-rq-pos.m4 \
+	$(top_srcdir)/config/kernel-blk-rq-sectors.m4 \
+	$(top_srcdir)/config/kernel-blkdev-get-by-path.m4 \
+	$(top_srcdir)/config/kernel-evict-inode.m4 \
+	$(top_srcdir)/config/kernel-fmode-t.m4 \
+	$(top_srcdir)/config/kernel-fsync.m4 \
+	$(top_srcdir)/config/kernel-get-disk-ro.m4 \
+	$(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
+	$(top_srcdir)/config/kernel-kobj-name-len.m4 \
+	$(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
+	$(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
+	$(top_srcdir)/config/kernel-rq-is_sync.m4 \
+	$(top_srcdir)/config/kernel-xattr-handler.m4 \
+	$(top_srcdir)/config/kernel.m4 \
+	$(top_srcdir)/config/user-arch.m4 \
+	$(top_srcdir)/config/user-frame-larger-than.m4 \
+	$(top_srcdir)/config/user-ioctl.m4 \
+	$(top_srcdir)/config/user-libblkid.m4 \
+	$(top_srcdir)/config/user-libuuid.m4 \
+	$(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
+	$(top_srcdir)/config/user-selinux.m4 \
+	$(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
+	$(top_srcdir)/config/zfs-build.m4 \
+	$(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/zfs_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(sbindir)"
+PROGRAMS = $(sbin_PROGRAMS)
+am_mount_zfs_OBJECTS = mount_zfs.$(OBJEXT)
+mount_zfs_OBJECTS = $(am_mount_zfs_OBJECTS)
+mount_zfs_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \
+	$(top_builddir)/lib/libavl/libavl.la \
+	$(top_builddir)/lib/libefi/libefi.la \
+	$(top_builddir)/lib/libnvpair/libnvpair.la \
+	$(top_builddir)/lib/libunicode/libunicode.la \
+	$(top_builddir)/lib/libuutil/libuutil.la \
+	$(top_builddir)/lib/libzpool/libzpool.la \
+	$(top_builddir)/lib/libzfs/libzfs.la
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+mount_zfs_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mount_zfs_LDFLAGS) $(LDFLAGS) -o $@
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(mount_zfs_SOURCES)
+DIST_SOURCES = $(mount_zfs_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALIEN = @ALIEN@
+ALIEN_VERSION = @ALIEN_VERSION@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
+DEBUG_STACKFLAGS = @DEBUG_STACKFLAGS@
+DEFAULT_PACKAGE = @DEFAULT_PACKAGE@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DPKG = @DPKG@
+DPKGBUILD = @DPKGBUILD@
+DPKGBUILD_VERSION = @DPKGBUILD_VERSION@
+DPKG_VERSION = @DPKG_VERSION@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FRAME_LARGER_THAN = @FRAME_LARGER_THAN@
+GREP = @GREP@
+HAVE_ALIEN = @HAVE_ALIEN@
+HAVE_DPKG = @HAVE_DPKG@
+HAVE_DPKGBUILD = @HAVE_DPKGBUILD@
+HAVE_RPM = @HAVE_RPM@
+HAVE_RPMBUILD = @HAVE_RPMBUILD@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KERNELCPPFLAGS = @KERNELCPPFLAGS@
+KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBBLKID = @LIBBLKID@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBSELINUX = @LIBSELINUX@
+LIBTOOL = @LIBTOOL@
+LIBUUID = @LIBUUID@
+LINUX = @LINUX@
+LINUX_OBJ = @LINUX_OBJ@
+LINUX_SYMBOLS = @LINUX_SYMBOLS@
+LINUX_VERSION = @LINUX_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+RPM = @RPM@
+RPMBUILD = @RPMBUILD@
+RPMBUILD_VERSION = @RPMBUILD_VERSION@
+RPM_VERSION = @RPM_VERSION@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SPL = @SPL@
+SPL_OBJ = @SPL_OBJ@
+SPL_SYMBOLS = @SPL_SYMBOLS@
+SPL_VERSION = @SPL_VERSION@
+STRIP = @STRIP@
+TARGET_ASM_DIR = @TARGET_ASM_DIR@
+VENDOR = @VENDOR@
+VERSION = @VERSION@
+ZFS_CONFIG = @ZFS_CONFIG@
+ZFS_META_ALIAS = @ZFS_META_ALIAS@
+ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
+ZFS_META_DATA = @ZFS_META_DATA@
+ZFS_META_LICENSE = @ZFS_META_LICENSE@
+ZFS_META_LT_AGE = @ZFS_META_LT_AGE@
+ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@
+ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@
+ZFS_META_NAME = @ZFS_META_NAME@
+ZFS_META_RELEASE = @ZFS_META_RELEASE@
+ZFS_META_VERSION = @ZFS_META_VERSION@
+ZLIB = @ZLIB@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+
+#
+# Ignore the prefix for the mount helper.  It must be installed in /sbin/
+# because this path is hardcoded in the mount(8) for security reasons.
+#
+sbindir = /sbin
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
+	-I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
+AM_LIBTOOLFLAGS = --silent
+AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
+	${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
+	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
+mount_zfs_SOURCES = \
+	$(top_srcdir)/cmd/mount_zfs/mount_zfs.c
+
+mount_zfs_LDADD = \
+	$(top_builddir)/lib/libspl/libspl.la \
+	$(top_builddir)/lib/libavl/libavl.la \
+	$(top_builddir)/lib/libefi/libefi.la \
+	$(top_builddir)/lib/libnvpair/libnvpair.la \
+	$(top_builddir)/lib/libunicode/libunicode.la \
+	$(top_builddir)/lib/libuutil/libuutil.la \
+	$(top_builddir)/lib/libzpool/libzpool.la \
+	$(top_builddir)/lib/libzfs/libzfs.la
+
+mount_zfs_LDFLAGS = \
+	-pthread -lm $(ZLIB) -lrt -ldl $(LIBUUID) $(LIBBLKID)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/Rules.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cmd/mount_zfs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu cmd/mount_zfs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-sbinPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+
+clean-sbinPROGRAMS:
+	@list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+mount.zfs$(EXEEXT): $(mount_zfs_OBJECTS) $(mount_zfs_DEPENDENCIES) 
+	@rm -f mount.zfs$(EXEEXT)
+	$(AM_V_CCLD)$(mount_zfs_LINK) $(mount_zfs_OBJECTS) $(mount_zfs_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount_zfs.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mount_zfs.o: $(top_srcdir)/cmd/mount_zfs/mount_zfs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mount_zfs.o -MD -MP -MF $(DEPDIR)/mount_zfs.Tpo -c -o mount_zfs.o `test -f '$(top_srcdir)/cmd/mount_zfs/mount_zfs.c' || echo '$(srcdir)/'`$(top_srcdir)/cmd/mount_zfs/mount_zfs.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mount_zfs.Tpo $(DEPDIR)/mount_zfs.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/cmd/mount_zfs/mount_zfs.c' object='mount_zfs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mount_zfs.o `test -f '$(top_srcdir)/cmd/mount_zfs/mount_zfs.c' || echo '$(srcdir)/'`$(top_srcdir)/cmd/mount_zfs/mount_zfs.c
+
+mount_zfs.obj: $(top_srcdir)/cmd/mount_zfs/mount_zfs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mount_zfs.obj -MD -MP -MF $(DEPDIR)/mount_zfs.Tpo -c -o mount_zfs.obj `if test -f '$(top_srcdir)/cmd/mount_zfs/mount_zfs.c'; then $(CYGPATH_W) '$(top_srcdir)/cmd/mount_zfs/mount_zfs.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/cmd/mount_zfs/mount_zfs.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mount_zfs.Tpo $(DEPDIR)/mount_zfs.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/cmd/mount_zfs/mount_zfs.c' object='mount_zfs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mount_zfs.obj `if test -f '$(top_srcdir)/cmd/mount_zfs/mount_zfs.c'; then $(CYGPATH_W) '$(top_srcdir)/cmd/mount_zfs/mount_zfs.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/cmd/mount_zfs/mount_zfs.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(sbindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-sbinPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-sbinPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-sbinPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-sbinPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-sbinPROGRAMS install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-sbinPROGRAMS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c
new file mode 100644
index 000000000..32f092199
--- /dev/null
+++ b/cmd/mount_zfs/mount_zfs.c
@@ -0,0 +1,470 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011 Lawrence Livermore National Security, LLC.
+ */
+
+#include <libintl.h>
+#include <unistd.h>
+#include <sys/file.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <libzfs.h>
+#ifdef HAVE_LIBSELINUX
+#include <selinux/selinux.h>
+#endif /* HAVE_LIBSELINUX */
+
+libzfs_handle_t *g_zfs;
+
+typedef struct option_map {
+	const char *name;
+	unsigned long mntmask;
+	unsigned long zfsmask;
+} option_map_t;
+
+static const option_map_t option_map[] = {
+	/* Canonicalized filesystem independent options from mount(8) */
+	{ MNTOPT_NOAUTO,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_DEFAULTS,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_NODEVICES,	MS_NODEV,	ZS_COMMENT	},
+	{ MNTOPT_DIRSYNC,	MS_DIRSYNC,	ZS_COMMENT	},
+	{ MNTOPT_NOEXEC,	MS_NOEXEC,	ZS_COMMENT	},
+	{ MNTOPT_GROUP,		MS_GROUP,	ZS_COMMENT	},
+	{ MNTOPT_NETDEV,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_NOFAIL,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_NOSUID,	MS_NOSUID,	ZS_COMMENT	},
+	{ MNTOPT_OWNER,		MS_OWNER,	ZS_COMMENT	},
+	{ MNTOPT_REMOUNT,	MS_REMOUNT,	ZS_COMMENT	},
+	{ MNTOPT_RO,		MS_RDONLY,	ZS_COMMENT	},
+	{ MNTOPT_RW,		MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_SYNC,		MS_SYNCHRONOUS,	ZS_COMMENT	},
+	{ MNTOPT_USER,		MS_USERS,	ZS_COMMENT	},
+	{ MNTOPT_USERS,		MS_USERS,	ZS_COMMENT	},
+#ifdef MS_NOATIME
+	{ MNTOPT_NOATIME,	MS_NOATIME,	ZS_COMMENT	},
+#endif
+#ifdef MS_NODIRATIME
+	{ MNTOPT_NODIRATIME,	MS_NODIRATIME,	ZS_COMMENT	},
+#endif
+#ifdef MS_RELATIME
+	{ MNTOPT_RELATIME,	MS_RELATIME,	ZS_COMMENT	},
+#endif
+#ifdef MS_STRICTATIME
+	{ MNTOPT_DFRATIME,	MS_STRICTATIME,	ZS_COMMENT	},
+#endif
+#ifdef HAVE_SELINUX
+	{ MNTOPT_CONTEXT,	MS_COMMENT,	ZS_NOCONTEXT	},
+	{ MNTOPT_NOCONTEXT,	MS_COMMENT,	ZS_NOCONTEXT	},
+	{ MNTOPT_FSCONTEXT,	MS_COMMENT,	ZS_NOCONTEXT	},
+	{ MNTOPT_DEFCONTEXT,	MS_COMMENT,	ZS_NOCONTEXT	},
+	{ MNTOPT_ROOTCONTEXT,	MS_COMMENT,	ZS_NOCONTEXT	},
+#endif
+#ifdef MS_I_VERSION
+	{ MNTOPT_IVERSION,	MS_I_VERSION,	ZS_COMMENT	},
+#endif
+#ifdef MS_MANDLOCK
+	{ MNTOPT_NBMAND,	MS_MANDLOCK,	ZS_COMMENT	},
+#endif
+	/* Valid options not found in mount(8) */
+	{ MNTOPT_BIND,		MS_BIND,	ZS_COMMENT	},
+#ifdef MS_REC
+	{ MNTOPT_RBIND,		MS_BIND|MS_REC,	ZS_COMMENT	},
+#endif
+	{ MNTOPT_COMMENT,	MS_COMMENT,	ZS_COMMENT	},
+#ifdef MS_NOSUB
+	{ MNTOPT_NOSUB,		MS_NOSUB,	ZS_COMMENT	},
+#endif
+#ifdef MS_SILENT
+	{ MNTOPT_QUIET,		MS_SILENT,	ZS_COMMENT	},
+#endif
+	/* Custom zfs options */
+	{ MNTOPT_NOXATTR,	MS_COMMENT,	ZS_COMMENT	},
+	{ MNTOPT_ZFSUTIL,	MS_COMMENT,	ZS_ZFSUTIL	},
+	{ NULL,			0,		0		} };
+
+/*
+ * Break the mount option in to a name/value pair.  The name is
+ * validated against the option map and mount flags set accordingly.
+ */
+static int
+parse_option(char *mntopt, unsigned long *mntflags,
+    unsigned long *zfsflags, int sloppy)
+{
+	const option_map_t *opt;
+	char *ptr, *name, *value = NULL;
+	int error = 0;
+
+	name = strdup(mntopt);
+	if (name == NULL)
+		return (ENOMEM);
+
+	for (ptr = name; ptr && *ptr; ptr++) {
+		if (*ptr == '=') {
+			*ptr = '\0';
+			value = ptr+1;
+			break;
+		}
+	}
+
+	for (opt = option_map; opt->name != NULL; opt++) {
+		if (strncmp(name, opt->name, strlen(name)) == 0) {
+			*mntflags |= opt->mntmask;
+			*zfsflags |= opt->zfsmask;
+
+			/* MS_USERS implies default user options */
+			if (opt->mntmask & (MS_USERS))
+				*mntflags |= (MS_NOEXEC|MS_NOSUID|MS_NODEV);
+
+			/* MS_OWNER|MS_GROUP imply default owner options */
+			if (opt->mntmask & (MS_OWNER | MS_GROUP))
+				*mntflags |= (MS_NOSUID|MS_NODEV);
+
+			error = 0;
+			goto out;
+		}
+	}
+
+	if (!sloppy)
+		error = ENOENT;
+out:
+	/* If required further process on the value may be done here */
+	free(name);
+	return (error);
+}
+
+/*
+ * Translate the mount option string in to MS_* mount flags for the
+ * kernel vfs.  When sloppy is non-zero unknown options will be ignored
+ * otherwise they are considered fatal are copied in to badopt.
+ */
+static int
+parse_options(char *mntopts, unsigned long *mntflags,
+    unsigned long *zfsflags, int sloppy, char *badopt)
+{
+	int error = 0, quote = 0, flag = 0;
+	char *ptr, *opt, *opts;
+
+	opts = strdup(mntopts);
+	if (opts == NULL)
+		return (ENOMEM);
+
+	*mntflags = 0;
+	opt = NULL;
+
+	/*
+	 * Scan through all mount options which must be comma delimited.
+	 * We must be careful to notice regions which are double quoted
+	 * and skip commas in these regions.  Each option is then checked
+	 * to determine if it is a known option.
+	 */
+	for (ptr = opts; ptr && !flag; ptr++) {
+		if (opt == NULL)
+			opt = ptr;
+
+		if (*ptr == '"')
+			quote = !quote;
+
+		if (quote)
+			continue;
+
+		if (*ptr == '\0')
+			flag = 1;
+
+		if ((*ptr == ',') || (*ptr == '\0')) {
+			*ptr = '\0';
+
+			error = parse_option(opt, mntflags, zfsflags, sloppy);
+			if (error) {
+				strcpy(badopt, opt);
+				goto out;
+			}
+
+			opt = NULL;
+		}
+	}
+
+out:
+	free(opts);
+	return (error);
+}
+
+/*
+ * If a file or directory in your current working directory is named
+ * 'dataset' then mount(8) will prepend your current working directory
+ * to dataset.  The is no way to prevent this behavior so we simply
+ * check for it and strip the prepended patch when it is added.
+ */
+static char *
+parse_dataset(char *dataset)
+{
+	char cwd[PATH_MAX];
+
+	(void) getcwd(cwd, PATH_MAX);
+	if (!strncmp(cwd, dataset, strlen(cwd)))
+		return (dataset + strlen(cwd) + 1);
+
+	return (dataset);
+}
+
+/*
+ * Update the mtab_* code to use the libmount library when it is commonly
+ * available otherwise fallback to legacy mode.  The mount(8) utility will
+ * manage the lock file for us to prevent racing updates to /etc/mtab.
+ */
+static int
+mtab_is_writeable(void)
+{
+	struct stat st;
+	int error, fd;
+
+	error = stat(MNTTAB, &st);
+	if (error || S_ISLNK(st.st_mode))
+		return (0);
+
+	fd = open(MNTTAB, O_RDWR | O_CREAT, 0644);
+	if (fd < 0)
+		return (0);
+
+	close(fd);
+	return (1);
+}
+
+static int
+mtab_update(char *dataset, char *mntpoint, char *type, char *mntopts)
+{
+	struct mntent mnt;
+	FILE *fp;
+	int error;
+
+	mnt.mnt_fsname = dataset;
+	mnt.mnt_dir = mntpoint;
+	mnt.mnt_type = type;
+	mnt.mnt_opts = mntopts ? mntopts : "";
+	mnt.mnt_freq = 0;
+	mnt.mnt_passno = 0;
+
+	fp = setmntent(MNTTAB, "a+");
+	if (!fp) {
+		(void) fprintf(stderr, gettext(
+		    "filesystem '%s' was mounted, but %s "
+		    "could not be opened due to error %d\n"),
+		    dataset, MNTTAB, errno);
+		return (MOUNT_FILEIO);
+	}
+
+	error = addmntent(fp, &mnt);
+	if (error) {
+		(void) fprintf(stderr, gettext(
+		    "filesystem '%s' was mounted, but %s "
+		    "could not be updated due to error %d\n"),
+		    dataset, MNTTAB, errno);
+		return (MOUNT_FILEIO);
+	}
+
+	(void) endmntent(fp);
+
+	return (MOUNT_SUCCESS);
+}
+
+int
+main(int argc, char **argv)
+{
+	zfs_handle_t *zhp;
+	char legacy[ZFS_MAXPROPLEN];
+	char mntopts[MNT_LINE_MAX] = { '\0' };
+	char badopt[MNT_LINE_MAX] = { '\0' };
+	char *dataset, *mntpoint;
+	unsigned long mntflags = 0, zfsflags = 0;
+	int sloppy = 0, fake = 0, verbose = 0, nomtab = 0, zfsutil = 0;
+	int error, c;
+
+	(void) setlocale(LC_ALL, "");
+	(void) textdomain(TEXT_DOMAIN);
+
+	opterr = 0;
+
+	/* check options */
+	while ((c = getopt(argc, argv, "sfnvo:h?")) != -1) {
+		switch (c) {
+		case 's':
+			sloppy = 1;
+			break;
+		case 'f':
+			fake = 1;
+			break;
+		case 'n':
+			nomtab = 1;
+			break;
+		case 'v':
+			verbose++;
+			break;
+		case 'o':
+			(void) strlcpy(mntopts, optarg, sizeof (mntopts));
+			break;
+		case 'h':
+		case '?':
+			(void) fprintf(stderr, gettext("Invalid option '%c'\n"),
+			    optopt);
+			(void) fprintf(stderr, gettext("Usage: mount.zfs "
+			    "[-sfnv] [-o options] <dataset> <mountpoint>\n"));
+			return (MOUNT_USAGE);
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	/* check that we only have two arguments */
+	if (argc != 2) {
+		if (argc == 0)
+			(void) fprintf(stderr, gettext("missing dataset "
+			    "argument\n"));
+		else if (argc == 1)
+			(void) fprintf(stderr,
+			    gettext("missing mountpoint argument\n"));
+		else
+			(void) fprintf(stderr, gettext("too many arguments\n"));
+		(void) fprintf(stderr, "usage: mount <dataset> <mountpoint>\n");
+		return (MOUNT_USAGE);
+	}
+
+	dataset = parse_dataset(argv[0]);
+	mntpoint = argv[1];
+
+	/* validate mount options and set mntflags */
+	error = parse_options(mntopts, &mntflags, &zfsflags, sloppy, badopt);
+	if (error) {
+		switch (error) {
+		case ENOMEM:
+			(void) fprintf(stderr, gettext("filesystem '%s' "
+			    "cannot be mounted due to a memory allocation "
+			    "failure\n"), dataset);
+			return (MOUNT_SYSERR);
+		case EINVAL:
+			(void) fprintf(stderr, gettext("filesystem '%s' "
+			    "cannot be mounted of due to the invalid option "
+			    "'%s'\n"), dataset, badopt);
+			(void) fprintf(stderr, gettext("Use the '-s' option "
+			    "to ignore the bad mount option.\n"));
+			return (MOUNT_USAGE);
+		default:
+			(void) fprintf(stderr, gettext("filesystem '%s' "
+			    "cannot be mounted due to internal error %d\n"),
+			    dataset, error);
+			return (MOUNT_SOFTWARE);
+		}
+	}
+
+#ifdef HAVE_LIBSELINUX
+	/*
+	 * Automatically add the default zfs context when selinux is enabled
+	 * and the caller has not specified their own context.  This must be
+	 * done until zfs is added to the default selinux policy configuration
+	 * as a known filesystem type which supports xattrs.
+	 */
+        if (is_selinux_enabled() && !(zfsflags & ZS_NOCONTEXT))
+                (void) strlcat(mntopts, ",context=\"system_u:"
+                    "object_r:file_t:s0\"", sizeof (mntopts));
+#endif /* HAVE_LIBSELINUX */
+
+
+	if (verbose)
+		(void) fprintf(stdout, gettext("mount.zfs:\n"
+		    "  dataset:    \"%s\"\n  mountpoint: \"%s\"\n"
+		    "  mountflags: 0x%lx\n  zfsflags:   0x%lx\n"
+		    "  mountopts:  \"%s\"\n\n"),
+		    dataset, mntpoint, mntflags, zfsflags, mntopts);
+
+	if (mntflags & MS_REMOUNT)
+		nomtab = 1;
+
+	if (zfsflags * ZS_ZFSUTIL)
+		zfsutil = 1;
+
+	if ((g_zfs = libzfs_init()) == NULL)
+		return (MOUNT_SYSERR);
+
+	/* try to open the dataset to access the mount point */
+	if ((zhp = zfs_open(g_zfs, dataset, ZFS_TYPE_FILESYSTEM)) == NULL) {
+		(void) fprintf(stderr, gettext("filesystem '%s' cannot be "
+		    "mounted, unable to open the dataset\n"), dataset);
+		libzfs_fini(g_zfs);
+		return (MOUNT_USAGE);
+	}
+
+	(void) zfs_prop_get(zhp, ZFS_PROP_MOUNTPOINT, legacy,
+	    sizeof (legacy), NULL, NULL, 0, B_FALSE);
+
+	zfs_close(zhp);
+	libzfs_fini(g_zfs);
+
+	/*
+	 * Legacy mount points may only be mounted using 'mount', never using
+	 * 'zfs mount'.  However, since 'zfs mount' actually invokes 'mount'
+	 * we differentiate the two cases using the 'zfsutil' mount option.
+	 * This mount option should only be supplied by the 'zfs mount' util.
+	 */
+	if (zfsutil && !strcmp(legacy, ZFS_MOUNTPOINT_LEGACY)) {
+		(void) fprintf(stderr, gettext(
+		    "filesystem '%s' cannot be mounted using 'zfs mount'.\n"
+		    "Use 'zfs set mountpoint=%s' or 'mount -t zfs %s %s'.\n"
+		    "See zfs(8) for more information.\n"),
+		   dataset, mntpoint, dataset, mntpoint);
+		return (MOUNT_USAGE);
+	}
+
+	if (!zfsutil && strcmp(legacy, ZFS_MOUNTPOINT_LEGACY)) {
+		(void) fprintf(stderr, gettext(
+		    "filesystem '%s' cannot be mounted using 'mount'.\n"
+		    "Use 'zfs set mountpoint=%s' or 'zfs mount %s'.\n"
+		    "See zfs(8) for more information.\n"),
+		    dataset, "legacy", dataset);
+		return (MOUNT_USAGE);
+	}
+
+	if (!fake) {
+		error = mount(dataset, mntpoint, MNTTYPE_ZFS,
+		    mntflags, mntopts);
+		if (error) {
+			switch (errno) {
+			case EBUSY:
+				(void) fprintf(stderr, gettext("filesystem "
+				    "'%s' is already mounted\n"), dataset);
+				return (MOUNT_SYSERR);
+			default:
+				(void) fprintf(stderr, gettext("filesystem "
+				    "'%s' can not be mounted due to error "
+				    "%d\n"), dataset, errno);
+				return (MOUNT_USAGE);
+			}
+		}
+	}
+
+	if (!nomtab && mtab_is_writeable()) {
+		error = mtab_update(dataset, mntpoint, MNTTYPE_ZFS, mntopts);
+		if (error)
+			return (error);
+	}
+
+	return (MOUNT_SUCCESS);
+}
diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index f21c36b81..32f85b1e0 100644
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -3827,371 +3827,6 @@ zfs_do_python(int argc, char **argv)
 	return (-1);
 }
 
-typedef struct option_map {
-	const char *name;
-	int mask;
-} option_map_t;
-
-static const option_map_t option_map[] = {
-	/* Canonicalized filesystem independent options from mount(8) */
-	{ MNTOPT_NOAUTO,	MS_COMMENT	},
-	{ MNTOPT_DEFAULTS,	MS_COMMENT	},
-	{ MNTOPT_NODEVICES,	MS_NODEV	},
-	{ MNTOPT_DIRSYNC,	MS_DIRSYNC	},
-	{ MNTOPT_NOEXEC,	MS_NOEXEC	},
-	{ MNTOPT_GROUP,		MS_GROUP	},
-	{ MNTOPT_NETDEV,	MS_COMMENT	},
-	{ MNTOPT_NOFAIL,	MS_COMMENT	},
-	{ MNTOPT_NOSUID,	MS_NOSUID	},
-	{ MNTOPT_OWNER,		MS_OWNER	},
-	{ MNTOPT_REMOUNT,	MS_REMOUNT	},
-	{ MNTOPT_RO,		MS_RDONLY	},
-	{ MNTOPT_SYNC,		MS_SYNCHRONOUS	},
-	{ MNTOPT_USER,		MS_USERS	},
-	{ MNTOPT_USERS,		MS_USERS	},
-#ifdef MS_NOATIME
-	{ MNTOPT_NOATIME,	MS_NOATIME	},
-#endif
-#ifdef MS_NODIRATIME
-	{ MNTOPT_NODIRATIME,	MS_NODIRATIME	},
-#endif
-#ifdef MS_RELATIME
-	{ MNTOPT_RELATIME,	MS_RELATIME	},
-#endif
-#ifdef MS_STRICTATIME
-	{ MNTOPT_DFRATIME,	MS_STRICTATIME	},
-#endif
-#ifdef HAVE_SELINUX
-	{ MNTOPT_CONTEXT,	MS_COMMENT	},
-	{ MNTOPT_FSCONTEXT,	MS_COMMENT	},
-	{ MNTOPT_DEFCONTEXT,	MS_COMMENT	},
-	{ MNTOPT_ROOTCONTEXT,	MS_COMMENT	},
-#endif
-#ifdef MS_I_VERSION
-	{ MNTOPT_IVERSION,	MS_I_VERSION	},
-#endif
-#ifdef MS_MANDLOCK
-	{ MNTOPT_NBMAND,	MS_MANDLOCK	},
-#endif
-	/* Valid options not found in mount(8) */
-	{ MNTOPT_BIND,		MS_BIND		},
-#ifdef MS_REC
-	{ MNTOPT_RBIND,		MS_BIND|MS_REC	},
-#endif
-	{ MNTOPT_COMMENT,	MS_COMMENT	},
-	{ MNTOPT_BOOTWAIT,	MS_COMMENT	},
-	{ MNTOPT_NOBOOTWAIT,	MS_COMMENT	},
-	{ MNTOPT_OPTIONAL,	MS_COMMENT	},
-	{ MNTOPT_SHOWTHROUGH,	MS_COMMENT	},
-#ifdef MS_NOSUB
-	{ MNTOPT_NOSUB,		MS_NOSUB	},
-#endif
-#ifdef MS_SILENT
-	{ MNTOPT_QUIET,		MS_SILENT	},
-#endif
-	/* Custom zfs options */
-	{ MNTOPT_NOXATTR,	MS_COMMENT	},
-	{ NULL,			0		} };
-
-/*
- * Break the mount option in to a name/value pair.  The name is
- * validated against the option map and mount flags set accordingly.
- */
-static int
-parse_option(char *mntopt, unsigned long *mntflags, int sloppy)
-{
-	const option_map_t *opt;
-	char *ptr, *name, *value = NULL;
-	int rc = 0;
-
-	name = strdup(mntopt);
-	if (name == NULL)
-		return (ENOMEM);
-
-	for (ptr = name; ptr && *ptr; ptr++) {
-		if (*ptr == '=') {
-			*ptr = '\0';
-			value = ptr+1;
-			break;
-		}
-	}
-
-	for (opt = option_map; opt->name != NULL; opt++) {
-		if (strncmp(name, opt->name, strlen(name)) == 0) {
-			*mntflags |= opt->mask;
-
-			/* MS_USERS implies default user options */
-			if (opt->mask & (MS_USERS))
-				*mntflags |= (MS_NOEXEC|MS_NOSUID|MS_NODEV);
-
-			/* MS_OWNER|MS_GROUP imply default owner options */
-			if (opt->mask & (MS_OWNER | MS_GROUP))
-				*mntflags |= (MS_NOSUID|MS_NODEV);
-
-			rc = 0;
-			goto out;
-		}
-	}
-
-	if (!sloppy)
-		rc = ENOENT;
-out:
-	/* If required further process on the value may be done here */
-	free(name);
-	return (rc);
-}
-
-/*
- * Translate the mount option string in to MS_* mount flags for the
- * kernel vfs.  When sloppy is non-zero unknown options will be ignored
- * otherwise they are considered fatal are copied in to badopt.
- */
-static int
-parse_options(char *mntopts, unsigned long *mntflags, int sloppy, char *badopt)
-{
-	int rc = 0, quote = 0;
-	char *ptr, *opt, *opts;
-
-	opts = strdup(mntopts);
-	if (opts == NULL)
-		return (ENOMEM);
-
-	*mntflags = 0;
-	opt = NULL;
-
-	/*
-	 * Scan through all mount options which must be comma delimited.
-	 * We must be careful to notice regions which are double quoted
-	 * and skip commas in these regions.  Each option is then checked
-	 * to determine if it is a known option.
-	 */
-	for (ptr = opts; ptr && *ptr; ptr++) {
-		if (opt == NULL)
-			opt = ptr;
-
-		if (*ptr == '"')
-			quote = !quote;
-
-		if (quote)
-			continue;
-
-		if ((*ptr == ',') || (*ptr == '\0')) {
-			*ptr = '\0';
-			rc = parse_option(opt, mntflags, sloppy);
-			if (rc) {
-				strcpy(badopt, opt);
-				goto out;
-			}
-
-			opt = NULL;
-		}
-	}
-out:
-	free(opts);
-	return (rc);
-}
-
-/*
- * Called when invoked as /sbin/mount.zfs, mount helper for mount(8).
- */
-static int
-manual_mount(int argc, char **argv)
-{
-	zfs_handle_t *zhp;
-	char legacy[ZFS_MAXPROPLEN];
-	char mntopts[MNT_LINE_MAX] = { '\0' };
-	char badopt[MNT_LINE_MAX] = { '\0' };
-	char *dataset, *mntpoint;
-	unsigned long mntflags;
-	int sloppy = 0, fake = 0, verbose = 0;
-	int rc, c;
-
-	/* check options */
-	while ((c = getopt(argc, argv, "sfnvo:h?")) != -1) {
-		switch (c) {
-		case 's':
-			sloppy = 1;
-			break;
-		case 'f':
-			fake = 1;
-			break;
-		case 'n':
-			/* Ignored, handled by mount(8) */
-			break;
-		case 'v':
-			verbose++;
-			break;
-		case 'o':
-			(void) strlcpy(mntopts, optarg, sizeof (mntopts));
-			break;
-		case 'h':
-		case '?':
-			(void) fprintf(stderr, gettext("Invalid option '%c'\n"),
-			    optopt);
-			(void) fprintf(stderr, gettext("Usage: mount.zfs "
-			    "[-sfnv] [-o options] <dataset> <mountpoint>\n"));
-			return (MOUNT_USAGE);
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-
-	/* check that we only have two arguments */
-	if (argc != 2) {
-		if (argc == 0)
-			(void) fprintf(stderr, gettext("missing dataset "
-			    "argument\n"));
-		else if (argc == 1)
-			(void) fprintf(stderr,
-			    gettext("missing mountpoint argument\n"));
-		else
-			(void) fprintf(stderr, gettext("too many arguments\n"));
-		(void) fprintf(stderr, "usage: mount <dataset> <mountpoint>\n");
-		return (MOUNT_USAGE);
-	}
-
-	dataset = argv[0];
-	mntpoint = argv[1];
-
-	/* try to open the dataset to access the mount point */
-	if ((zhp = zfs_open(g_zfs, dataset, ZFS_TYPE_FILESYSTEM)) == NULL) {
-		(void) fprintf(stderr, gettext("filesystem '%s' cannot be "
-		    "mounted, unable to open the dataset\n"), dataset);
-		return (MOUNT_USAGE);
-	}
-
-	(void) zfs_prop_get(zhp, ZFS_PROP_MOUNTPOINT, legacy,
-	    sizeof (legacy), NULL, NULL, 0, B_FALSE);
-
-	zfs_close(zhp);
-
-	/* check for legacy mountpoint or util mount option */
-	if ((!strcmp(legacy, ZFS_MOUNTPOINT_LEGACY) == 0) &&
-	    (strstr(mntopts, MNTOPT_ZFSUTIL) == NULL)) {
-		(void) fprintf(stderr, gettext("filesystem '%s' cannot be "
-		    "mounted using 'mount -a -t zfs'\n"), dataset);
-		(void) fprintf(stderr, gettext("Use 'zfs set mountpoint=%s' "
-		    "instead.\n"), mntpoint);
-		(void) fprintf(stderr, gettext("If you must use 'mount -a -t "
-		    "zfs' or /etc/fstab, use 'zfs set mountpoint=legacy'.\n"));
-		(void) fprintf(stderr, gettext("See zfs(8) for more "
-		    "information.\n"));
-		return (MOUNT_USAGE);
-	}
-
-	/* validate mount options and set mntflags */
-	rc = parse_options(mntopts, &mntflags, sloppy, badopt);
-	if (rc) {
-		switch (rc) {
-		case ENOMEM:
-			(void) fprintf(stderr, gettext("filesystem '%s' "
-			    "cannot be mounted due to a memory allocation "
-			    "failure\n"), dataset);
-			return (MOUNT_SYSERR);
-		case EINVAL:
-			(void) fprintf(stderr, gettext("filesystem '%s' "
-			    "cannot be mounted of due to the invalid option "
-			    "'%s'\n"), dataset, badopt);
-			(void) fprintf(stderr, gettext("Use the '-s' option "
-			    "to ignore the bad mount option.\n"));
-			return (MOUNT_USAGE);
-		default:
-			(void) fprintf(stderr, gettext("filesystem '%s' "
-			    "cannot be mounted due to internal error %d\n"),
-			    dataset, rc);
-			return (MOUNT_SOFTWARE);
-		}
-	}
-
-	if (verbose > 2)
-		printf("mount.zfs: dataset: \"%s\", mountpoint: \"%s\" "
-		    "mountflags: 0x%lx, mountopts: \"%s\"\n", dataset,
-		    mntpoint, mntflags, mntopts);
-
-	/* load the zfs posix layer module (zpl) */
-	if (libzfs_load_module("zpl")) {
-		(void) fprintf(stderr, gettext("filesystem '%s' cannot be "
-		    "mounted without the zpl kernel module\n"), dataset);
-		(void) fprintf(stderr, gettext("Use 'dmesg' to determine why "
-		    "the module could not be loaded.\n"));
-		return (MOUNT_SYSERR);
-	}
-
-	if (!fake) {
-		rc = mount(dataset, mntpoint, MNTTYPE_ZFS, mntflags, mntopts);
-		if (rc) {
-			(void) fprintf(stderr, gettext("filesystem '%s' can"
-			    "not be mounted due to error %d\n"), dataset, rc);
-			return (MOUNT_USAGE);
-		}
-	}
-
-	return (MOUNT_SUCCESS);
-}
-
-#ifdef HAVE_UNMOUNT_HELPER
-/*
- * Called when invoked as /sbin/umount.zfs, mount helper for mount(8).
- * Unlike a manual mount, we allow unmounts of non-legacy filesystems,
- * as this is the dominant administrative interface.
- */
-static int
-manual_unmount(int argc, char **argv)
-{
-	int verbose = 0, flags = 0;
-	int c;
-
-	/* check options */
-	while ((c = getopt(argc, argv, "nlfvrh?")) != -1) {
-		switch (c) {
-		case 'n':
-			/* Ignored, handled by mount(8) */
-			break;
-		case 'l':
-			flags = MS_DETACH;
-			break;
-		case 'f':
-			flags = MS_FORCE;
-			break;
-		case 'v':
-			verbose++;
-			break;
-		case 'r':
-			/* Remount read-only on umount failure, unsupported */
-			(void) fprintf(stderr, gettext("Unsupported option "
-			    "'%c'\n"), optopt);
-			return (MOUNT_USAGE);
-		case 'h':
-		case '?':
-			(void) fprintf(stderr, gettext("Invalid option '%c'\n"),
-			    optopt);
-			(void) fprintf(stderr, gettext("Usage: umount.zfs "
-			    "[-nlfvr] <mountpoint>\n"));
-			return (MOUNT_USAGE);
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-
-	/* check that we only have one argument */
-	if (argc != 1) {
-		if (argc == 0)
-			(void) fprintf(stderr, gettext("missing mountpoint "
-			    "argument\n"));
-		else
-			(void) fprintf(stderr, gettext("too many arguments\n"));
-
-		(void) fprintf(stderr, gettext("Usage: umount.zfs [-nlfvr] "
-		    "<mountpoint>\n"));
-		return (MOUNT_USAGE);
-	}
-
-	return (unshare_unmount_path(OP_MOUNT, argv[0], flags, B_TRUE));
-}
-#endif /* HAVE_UNMOUNT_HELPER */
-
 static int
 find_command_idx(char *command, int *idx)
 {
@@ -4289,7 +3924,6 @@ main(int argc, char **argv)
 {
 	int ret;
 	int i = 0;
-	char *progname;
 	char *cmdname;
 
 	(void) setlocale(LC_ALL, "");
@@ -4304,78 +3938,64 @@ main(int argc, char **argv)
 	}
 
 	/*
-	 * This command also doubles as the /etc/fs mount and unmount program.
-	 * Determine if we should take this behavior based on argv[0].
+	 * Make sure the user has specified some command.
 	 */
-	progname = basename(argv[0]);
-	if (strcmp(progname, "mount.zfs") == 0) {
-		ret = manual_mount(argc, argv);
-#ifdef HAVE_UNMOUNT_HELPER
-	} else if (strcmp(progname, "umount.zfs") == 0) {
-		ret = manual_unmount(argc, argv);
-#endif /* HAVE_UNMOUNT_HELPER */
-	} else {
-		/*
-		 * Make sure the user has specified some command.
-		 */
-		if (argc < 2) {
-			(void) fprintf(stderr, gettext("missing command\n"));
-			usage(B_FALSE);
-		}
+	if (argc < 2) {
+		(void) fprintf(stderr, gettext("missing command\n"));
+		usage(B_FALSE);
+	}
 
-		cmdname = argv[1];
+	cmdname = argv[1];
 
-		/*
-		 * The 'umount' command is an alias for 'unmount'
-		 */
-		if (strcmp(cmdname, "umount") == 0)
-			cmdname = "unmount";
+	/*
+	 * The 'umount' command is an alias for 'unmount'
+	 */
+	if (strcmp(cmdname, "umount") == 0)
+		cmdname = "unmount";
 
-		/*
-		 * The 'recv' command is an alias for 'receive'
-		 */
-		if (strcmp(cmdname, "recv") == 0)
-			cmdname = "receive";
+	/*
+	 * The 'recv' command is an alias for 'receive'
+	 */
+	if (strcmp(cmdname, "recv") == 0)
+		cmdname = "receive";
 
-		/*
-		 * Special case '-?'
-		 */
-		if ((strcmp(cmdname, "-?") == 0) ||
-		    (strcmp(cmdname, "--help") == 0))
-			usage(B_TRUE);
+	/*
+	 * Special case '-?'
+	 */
+	if ((strcmp(cmdname, "-?") == 0) ||
+	    (strcmp(cmdname, "--help") == 0))
+		usage(B_TRUE);
 
-		if ((g_zfs = libzfs_init()) == NULL)
-			return (1);
+	if ((g_zfs = libzfs_init()) == NULL)
+		return (1);
 
-		zpool_set_history_str("zfs", argc, argv, history_str);
-		verify(zpool_stage_history(g_zfs, history_str) == 0);
+	zpool_set_history_str("zfs", argc, argv, history_str);
+	verify(zpool_stage_history(g_zfs, history_str) == 0);
 
-		libzfs_print_on_error(g_zfs, B_TRUE);
+	libzfs_print_on_error(g_zfs, B_TRUE);
 
-		/*
-		 * Run the appropriate command.
-		 */
-		libzfs_mnttab_cache(g_zfs, B_TRUE);
-		if (find_command_idx(cmdname, &i) == 0) {
-			current_command = &command_table[i];
-			ret = command_table[i].func(argc - 1, argv + 1);
-		} else if (strchr(cmdname, '=') != NULL) {
-			verify(find_command_idx("set", &i) == 0);
-			current_command = &command_table[i];
-			ret = command_table[i].func(argc, argv);
-		} else {
-			(void) fprintf(stderr, gettext("unrecognized "
-			    "command '%s'\n"), cmdname);
-			usage(B_FALSE);
-			ret = 1;
-		}
-		libzfs_mnttab_cache(g_zfs, B_FALSE);
+	/*
+	 * Run the appropriate command.
+	 */
+	libzfs_mnttab_cache(g_zfs, B_TRUE);
+	if (find_command_idx(cmdname, &i) == 0) {
+		current_command = &command_table[i];
+		ret = command_table[i].func(argc - 1, argv + 1);
+	} else if (strchr(cmdname, '=') != NULL) {
+		verify(find_command_idx("set", &i) == 0);
+		current_command = &command_table[i];
+		ret = command_table[i].func(argc, argv);
+	} else {
+		(void) fprintf(stderr, gettext("unrecognized "
+		    "command '%s'\n"), cmdname);
+		usage(B_FALSE);
+		ret = 1;
 	}
+	libzfs_mnttab_cache(g_zfs, B_FALSE);
+	libzfs_fini(g_zfs);
 
 	(void) fclose(mnttab_file);
 
-	libzfs_fini(g_zfs);
-
 	/*
 	 * The 'ZFS_ABORT' environment variable causes us to dump core on exit
 	 * for the purposes of running ::findleaks.
diff --git a/configure b/configure
index ea6e1bc34..10caf65cb 100755
--- a/configure
+++ b/configure
@@ -19911,7 +19911,7 @@ fi
 $as_echo "$enable_debug" >&6; }
 
 
-ac_config_files="$ac_config_files Makefile etc/Makefile man/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/sysevent/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/zpool_id/Makefile cmd/zpool_layout/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/zvol_id/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/zpool-layout/Makefile scripts/common.sh zfs.spec zfs-modules.spec zfs-script-config.sh"
+ac_config_files="$ac_config_files Makefile etc/Makefile man/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/sysevent/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/zpool_layout/Makefile cmd/zvol_id/Makefile cmd/zpool_id/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/zpool-layout/Makefile scripts/common.sh zfs.spec zfs-modules.spec zfs-script-config.sh"
 
 
 cat >confcache <<\_ACEOF
@@ -20856,11 +20856,12 @@ do
     "cmd/zfs/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/zfs/Makefile" ;;
     "cmd/zinject/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/zinject/Makefile" ;;
     "cmd/zpool/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/zpool/Makefile" ;;
-    "cmd/zpool_id/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/zpool_id/Makefile" ;;
-    "cmd/zpool_layout/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/zpool_layout/Makefile" ;;
     "cmd/ztest/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/ztest/Makefile" ;;
     "cmd/zpios/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/zpios/Makefile" ;;
+    "cmd/mount_zfs/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/mount_zfs/Makefile" ;;
+    "cmd/zpool_layout/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/zpool_layout/Makefile" ;;
     "cmd/zvol_id/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/zvol_id/Makefile" ;;
+    "cmd/zpool_id/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/zpool_id/Makefile" ;;
     "module/Makefile") CONFIG_FILES="$CONFIG_FILES module/Makefile" ;;
     "module/avl/Makefile") CONFIG_FILES="$CONFIG_FILES module/avl/Makefile" ;;
     "module/nvpair/Makefile") CONFIG_FILES="$CONFIG_FILES module/nvpair/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index abb3ff6ce..a5727824a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,11 +83,12 @@ AC_CONFIG_FILES([
 	cmd/zfs/Makefile
 	cmd/zinject/Makefile
 	cmd/zpool/Makefile
-	cmd/zpool_id/Makefile
-	cmd/zpool_layout/Makefile
 	cmd/ztest/Makefile
 	cmd/zpios/Makefile
+	cmd/mount_zfs/Makefile
+	cmd/zpool_layout/Makefile
 	cmd/zvol_id/Makefile
+	cmd/zpool_id/Makefile
 	module/Makefile
 	module/avl/Makefile
 	module/nvpair/Makefile
diff --git a/lib/libspl/include/sys/mntent.h b/lib/libspl/include/sys/mntent.h
index d552c9c17..1cbdc3aeb 100644
--- a/lib/libspl/include/sys/mntent.h
+++ b/lib/libspl/include/sys/mntent.h
@@ -31,9 +31,6 @@
 
 #define	MNTTYPE_ZFS	"zfs"		/* ZFS file system */
 
-#define	FSTAB		"/etc/fstab"
-#define	MNTMAXSTR	128
-
 #define	MOUNT_SUCCESS	0x00		/* Success */
 #define	MOUNT_USAGE	0x01		/* Invalid invocation or permissions */
 #define	MOUNT_SYSERR	0x02		/* System error (ENOMEM, etc) */
@@ -49,6 +46,7 @@
 #define	MNTOPT_AUTO	"auto"		/* automount */
 #define	MNTOPT_NOAUTO	"noauto"	/* do not automount */
 #define	MNTOPT_CONTEXT	"context"	/* selinux context */
+#define	MNTOPT_NOCONTEXT "nocontext"	/* No selinux context (zfs-only) */
 #define	MNTOPT_FSCONTEXT "fscontext"	/* selinux fscontext */
 #define	MNTOPT_DEFCONTEXT "defcontext"	/* selinux defcontext */
 #define	MNTOPT_ROOTCONTEXT "rootcontext" /* selinux rootcontext */
@@ -93,10 +91,10 @@
 #define	MNTOPT_XATTR	"user_xattr"	/* enable extended attributes */
 #define	MNTOPT_NOXATTR	"nouser_xattr"	/* disable extended attributes */
 #define	MNTOPT_COMMENT	"comment"	/* comment */
-#define	MNTOPT_BOOTWAIT	"bootwait"
-#define	MNTOPT_NOBOOTWAIT "nobootwait"
-#define	MNTOPT_OPTIONAL	"optional"
-#define	MNTOPT_SHOWTHROUGH "showthrough"
 #define	MNTOPT_ZFSUTIL	"zfsutil"	/* called by zfs utility */
 
+#define ZS_COMMENT	0x00000000	/* comment */
+#define ZS_ZFSUTIL	0x00000001	/* caller is zfs(8) */
+#define ZS_NOCONTEXT	0x00000002	/* do not add selinux context */
+
 #endif	/* _SYS_MNTENT_H */
diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c
index f8f12d1bf..a1faf49d1 100644
--- a/lib/libzfs/libzfs_mount.c
+++ b/lib/libzfs/libzfs_mount.c
@@ -72,9 +72,6 @@
 #include <sys/mntent.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
-#ifdef HAVE_LIBSELINUX
-#include <selinux/selinux.h>
-#endif /* HAVE_LIBSELINUX */
 
 #include <libzfs.h>
 
@@ -346,12 +343,6 @@ zfs_mount(zfs_handle_t *zhp, const char *options, int flags)
 	 */
 	strlcat(mntopts, "," MNTOPT_ZFSUTIL, sizeof (mntopts));
 
-#ifdef HAVE_LIBSELINUX
-	if (is_selinux_enabled())
-		(void) strlcat(mntopts, ",context=\"system_u:"
-		    "object_r:file_t:s0\"", sizeof (mntopts));
-#endif /* HAVE_LIBSELINUX */
-
 	if (!zfs_is_mountable(zhp, mountpoint, sizeof (mountpoint), NULL))
 		return (0);
 
diff --git a/zfs.spec.in b/zfs.spec.in
index 4e1d4be15..9df76a8bd 100644
--- a/zfs.spec.in
+++ b/zfs.spec.in
@@ -66,6 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*
 %{_mandir}/man8/*
 /etc/*
+/sbin/*
 
 %files devel
 %defattr(-,root,root)