svn commit: r307283 - in stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys

[Alexander Motin]

Author: mav
Date: Fri Oct 14 07:30:54 2016
New Revision: 307283
URL: https://svnweb.freebsd.org/changeset/base/307283

Log:
  MFC r305333: MFV r304156: 7235 remove unused func dsl_dataset_set_blkptr
  
  illumos/illumos-gate at bd56f80007857b960e0981ed0797ad8ec844a96b
  https://github.com/illumos/illumos-gate/commit/bd56f80007857b960e0981ed0797ad8ec
  844a96b
  
  https://www.illumos.org/issues/7235
    The function dsl_dataset_set_blkptr() is unused. We should remove it.
  
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Reviewed by: Alex Reece <alex at delphix.com>
  Reviewed by: Prakash Surya <prakash.surya at delphix.com>
  Reviewed by: Igor Kozhukhov <ikozhukhov at gmail.com>
  Approved by: Robert Mustacchi <rm at joyent.com>
  Author: Matthew Ahrens <mahrens at delphix.com>

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Fri Oct 14 07:30:16 2016	(r307282)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Fri Oct 14 07:30:54 2016	(r307283)
@@ -1060,19 +1060,6 @@ dsl_dataset_get_blkptr(dsl_dataset_t *ds
 	return (&dsl_dataset_phys(ds)->ds_bp);
 }
 
-void
-dsl_dataset_set_blkptr(dsl_dataset_t *ds, blkptr_t *bp, dmu_tx_t *tx)
-{
-	ASSERT(dmu_tx_is_syncing(tx));
-	/* If it's the meta-objset, set dp_meta_rootbp */
-	if (ds == NULL) {
-		tx->tx_pool->dp_meta_rootbp = *bp;
-	} else {
-		dmu_buf_will_dirty(ds->ds_dbuf, tx);
-		dsl_dataset_phys(ds)->ds_bp = *bp;
-	}
-}
-
 spa_t *
 dsl_dataset_get_spa(dsl_dataset_t *ds)
 {

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h	Fri Oct 14 07:30:16 2016	(r307282)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h	Fri Oct 14 07:30:54 2016	(r307283)
@@ -272,7 +272,6 @@ int dsl_dataset_snapshot_tmp(const char 
     minor_t cleanup_minor, const char *htag);
 
 blkptr_t *dsl_dataset_get_blkptr(dsl_dataset_t *ds);
-void dsl_dataset_set_blkptr(dsl_dataset_t *ds, blkptr_t *bp, dmu_tx_t *tx);
 
 spa_t *dsl_dataset_get_spa(dsl_dataset_t *ds);