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

2008-12-22 10:15:21 -08:00 · 2008-12-22 10:15:21 -08:00 · b1db66256f
parent a724734a9b 42344f04c1
commit b1db66256f
1 changed files with 12 additions and 0 deletions
--- a/lib/libzfs/libzfs_mount.c
+++ b/lib/libzfs/libzfs_mount.c
@ -1433,4 +1433,16 @@ zfs_is_shared(zfs_handle_t *zhp)
 	return B_FALSE;
 }

+int
+zpool_enable_datasets(zpool_handle_t *zhp, const char *mntopts, int flags)
+{
+	return B_TRUE;
+}
+
+int
+zpool_disable_datasets(zpool_handle_t *zhp, boolean_t force)
+{
+	return B_TRUE;
+}
+
 #endif /* HAVE_ZPL */