Author: delphij
Date: Thu Sep 5 17:56:00 2013
New Revision: 255257
URL: http://svnweb.freebsd.org/changeset/base/255257
Log:
Update vendor-sys/illumos/dist to 14172:be36a38bac3d:
Illumos ZFS issues:
4082 zfs receive gets EFBIG from dmu_tx_hold_free()
Modified:
vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c
vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c Thu Sep 5 17:55:14
2013 (r255256)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu.c Thu Sep 5 17:56:00
2013 (r255257)
@@ -673,6 +673,16 @@ dmu_free_long_range(objset_t *os, uint64
if (err != 0)
return (err);
err = dmu_free_long_range_impl(os, dn, offset, length);
+
+ /*
+ * It is important to zero out the maxblkid when freeing the entire
+ * file, so that (a) subsequent calls to dmu_free_long_range_impl()
+ * will take the fast path, and (b) dnode_reallocate() can verify
+ * that the entire file has been freed.
+ */
+ if (offset == 0 && length == DMU_OBJECT_END)
+ dn->dn_maxblkid = 0;
+
dnode_rele(dn, FTAG);
return (err);
}
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c Thu Sep 5 17:55:14
2013 (r255256)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c Thu Sep 5 17:56:00
2013 (r255257)
@@ -605,7 +605,6 @@ dmu_tx_hold_free(dmu_tx_t *tx, uint64_t
if (len == DMU_OBJECT_END)
len = (dn->dn_maxblkid+1) * dn->dn_datablksz - off;
-
/*
* For i/o error checking, we read the first and last level-0
* blocks if they are not aligned, and all the level-1 blocks.
@@ -617,7 +616,7 @@ dmu_tx_hold_free(dmu_tx_t *tx, uint64_t
*/
if (dn->dn_datablkshift == 0) {
if (off != 0 || len < dn->dn_datablksz)
- dmu_tx_count_write(txh, off, len);
+ dmu_tx_count_write(txh, 0, dn->dn_datablksz);
} else {
/* first block will be modified if it is not aligned */
if (!IS_P2ALIGNED(off, 1 << dn->dn_datablkshift))
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
