From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 20 May 2011 17:25:41 +0000 (-0700)
Subject: Default to internal 'zfs userspace' implementation
X-Git-Tag: zfs-0.6.0-rc5~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4804b739e1e851f21f8e98c99275af2570c44a15;p=zfs

Default to internal 'zfs userspace' implementation

We will never bring over the pyzfs.py helper script from Solaris
to Linux.  Instead the missing functionality will be directly
integrated in to the zfs commands and libraries.  To avoid
confusion remove the warning about the missing pyzfs.py utility
and simply use the default internal support.

The Illumous developers are of the same mind and have proposed an
initial patch to do this which has been integrated in to the 'allow'
development branch.  After some additional testing this code
can be merged in to master as the right long term solution.
---

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index 32f85b1e0..0953336ab 100644
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -1879,16 +1879,6 @@ zfs_do_userspace(int argc, char **argv)
 	zfs_userquota_prop_t p;
 	int error;
 
-	/*
-	 * Try the python version.  If the execv fails, we'll continue
-	 * and do a simplistic implementation.
-	 */
-	(void) execv(pypath, argv-1);
-
-	(void) printf("internal error: %s not found\n"
-	    "falling back on built-in implementation, "
-	    "some features will not work\n", pypath);
-
 	if ((zhp = zfs_open(g_zfs, argv[argc-1], ZFS_TYPE_DATASET)) == NULL)
 		return (1);