svn commit: r219320 - in head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys

[Pawel Jakub Dawidek]

Author: pjd
Date: Sun Mar  6 01:22:14 2011
New Revision: 219320
URL: http://svn.freebsd.org/changeset/base/219320

Log:
  Fix libzpool build.
  
  MFC after:	1 month

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Sun Mar  6 00:57:08 2011	(r219319)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Sun Mar  6 01:22:14 2011	(r219320)
@@ -2336,7 +2336,9 @@ dsl_dataset_snapshot_rename_sync(void *a
 	    ds->ds_snapname, 8, 1, &ds->ds_object, tx);
 	ASSERT3U(err, ==, 0);
 	dsl_dataset_name(ds, newname);
+#ifdef _KERNEL
 	zvol_rename_minors(oldname, newname);
+#endif
 
 	spa_history_log_internal(LOG_DS_RENAME, dd->dd_pool->dp_spa, tx,
 	    "dataset = %llu", ds->ds_object);

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c	Sun Mar  6 00:57:08 2011	(r219319)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c	Sun Mar  6 01:22:14 2011	(r219320)
@@ -1344,7 +1344,9 @@ dsl_dir_rename_sync(void *arg1, void *ar
 	    dd->dd_myname, 8, 1, &dd->dd_object, tx);
 	ASSERT3U(err, ==, 0);
 	dsl_dir_name(dd, newname);
+#ifdef _KERNEL
 	zvol_rename_minors(oldname, newname);
+#endif
 
 	spa_history_log_internal(LOG_DS_RENAME, dd->dd_pool->dp_spa,
 	    tx, "dataset = %llu", dd->dd_phys->dd_head_dataset_obj);

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h	Sun Mar  6 00:57:08 2011	(r219319)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h	Sun Mar  6 01:22:14 2011	(r219320)
@@ -76,7 +76,7 @@ extern int zvol_create_minors(const char
 extern void zvol_rename_minors(const char *oldname, const char *newname);
 #endif
 
-#endif
+#endif	/* _KERNEL */
 
 #ifdef	__cplusplus
 }