Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 15 Oct 2019 14:13:01 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org
Subject:   svn commit: r353551 - vendor-sys/illumos/dist/uts/common/fs/zfs
Message-ID:  <201910151413.x9FED1IS000140@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: avg
Date: Tue Oct 15 14:13:01 2019
New Revision: 353551
URL: https://svnweb.freebsd.org/changeset/base/353551

Log:
  10452 ZoL: merge in large dnode feature fixes
  
  illumos/illumos-gate@946342a260bbae359b48bf142ec1fe40792ee862
  https://github.com/illumos/illumos-gate/commit/946342a260bbae359b48bf142ec1fe40792ee862
  
  https://www.illumos.org/issues/10452
    illumos is missing a few small follow up ZoL bug fixes for the large dnode
    feature. We should pull those in.
    Those commits are in the ZoL tree as (newest to oldest):
    PR 8435 - 75d6b7ddca269542279975f716a343bb40a79baf - Add missing copyright
    notice to large_dnode tests
    PR 7433 - e14a32b1c844d924b9f093375c0badcf10f61741 - Fix object reclaim when
    using large dnodes
    PR 6616 - 48fbb9ddbf2281911560dfbc2821aa8b74127315 - Free objects when
    receiving full stream as clone
    PR 6695 - 39f56627ae988d09b4e3803c01c22b2026b2310e - receive_freeobjects()
    skips freeing some object
  
  Portions contributed by: Ned Bass <bass6@llnl.gov>
  Portions contributed by: Tom Caputi <tcaputi@datto.com>
  Author: Fabian Grünbichler <f.gruenbichler@proxmox.com>

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_object.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_send.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/dnode.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_object.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_object.c	Tue Oct 15 12:08:09 2019	(r353550)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_object.c	Tue Oct 15 14:13:01 2019	(r353551)
@@ -263,7 +263,7 @@ dmu_object_reclaim(objset_t *os, uint64_t object, dmu_
     int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx)
 {
 	return (dmu_object_reclaim_dnsize(os, object, ot, blocksize, bonustype,
-	    bonuslen, 0, tx));
+	    bonuslen, DNODE_MIN_SIZE, tx));
 }
 
 int

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_send.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_send.c	Tue Oct 15 12:08:09 2019	(r353550)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_send.c	Tue Oct 15 14:13:01 2019	(r353551)
@@ -2205,11 +2205,13 @@ receive_object(struct receive_writer_arg *rwa, struct 
 	} else if (drro->drr_type != doi.doi_type ||
 	    drro->drr_blksz != doi.doi_data_block_size ||
 	    drro->drr_bonustype != doi.doi_bonus_type ||
-	    drro->drr_bonuslen != doi.doi_bonus_size) {
+	    drro->drr_bonuslen != doi.doi_bonus_size ||
+	    drro->drr_dn_slots != (doi.doi_dnodesize >> DNODE_SHIFT)) {
 		/* currently allocated, but with different properties */
-		err = dmu_object_reclaim(rwa->os, drro->drr_object,
+		err = dmu_object_reclaim_dnsize(rwa->os, drro->drr_object,
 		    drro->drr_type, drro->drr_blksz,
-		    drro->drr_bonustype, drro->drr_bonuslen, tx);
+		    drro->drr_bonustype, drro->drr_bonuslen,
+		    drro->drr_dn_slots << DNODE_SHIFT, tx);
 	}
 	if (err != 0) {
 		dmu_tx_commit(tx);
@@ -2259,12 +2261,10 @@ receive_freeobjects(struct receive_writer_arg *rwa,
 		int err;
 
 		err = dmu_object_info(rwa->os, obj, NULL);
-		if (err == ENOENT) {
-			obj++;
+		if (err == ENOENT)
 			continue;
-		} else if (err != 0) {
+		else if (err != 0)
 			return (err);
-		}
 
 		err = dmu_free_long_object(rwa->os, obj);
 		if (err != 0)

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dnode.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dnode.c	Tue Oct 15 12:08:09 2019	(r353550)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dnode.c	Tue Oct 15 14:13:01 2019	(r353551)
@@ -683,8 +683,7 @@ dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, in
 	ASSERT(DMU_OT_IS_VALID(bonustype));
 	ASSERT3U(bonuslen, <=,
 	    DN_BONUS_SIZE(spa_maxdnodesize(dmu_objset_spa(dn->dn_objset))));
-
-	dn_slots = dn_slots > 0 ? dn_slots : DNODE_MIN_SLOTS;
+	ASSERT3U(bonuslen, <=, DN_BONUS_SIZE(dn_slots << DNODE_SHIFT));
 
 	dnode_free_interior_slots(dn);
 	DNODE_STAT_BUMP(dnode_reallocate);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910151413.x9FED1IS000140>