Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

lib/libzfs/libzfs_pool.c

@@ -2198,7 +2198,7 @@ err:
 	free(paths);
 	(void) close(base);
 #endif
-	return (-1);
+	return (0);
 }
 
 typedef struct zvol_cb {

scripts/zpool-create.sh

@@ -62,6 +62,10 @@ while getopts 'hvc:p:' OPTION; do
 	esac
 done
 
+if [ $(id -u) != 0 ]; then
+        die "Must run as root"
+fi
+
 check_config || die "${ERROR}"
 . ${ZPOOL_CONFIG}