aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/module/zfs/dsl_dir.c
diff options
context:
space:
mode:
authorMatt Macy <mmacy@FreeBSD.org>2020-08-28 18:53:45 +0000
committerMatt Macy <mmacy@FreeBSD.org>2020-08-28 18:53:45 +0000
commitac0bf12ee5181e3f784b5bb87d60fc5321ebce2d (patch)
tree1201198222ad94274305aef3766d4cdaeb242cf8 /sys/contrib/openzfs/module/zfs/dsl_dir.c
parent341ccc993cf6da5ccdb1bc3f457d3c6eb2cb4d49 (diff)
parent93ddd0259dd285fbac5cc5086a039a22f1b046a1 (diff)
downloadsrc-ac0bf12ee5181e3f784b5bb87d60fc5321ebce2d.tar.gz
src-ac0bf12ee5181e3f784b5bb87d60fc5321ebce2d.zip
ZFS: MFV 2.0-rc1-ga00c61
Notes
Notes: svn path=/head/; revision=364930
Diffstat (limited to 'sys/contrib/openzfs/module/zfs/dsl_dir.c')
-rw-r--r--sys/contrib/openzfs/module/zfs/dsl_dir.c23
1 files changed, 6 insertions, 17 deletions
diff --git a/sys/contrib/openzfs/module/zfs/dsl_dir.c b/sys/contrib/openzfs/module/zfs/dsl_dir.c
index 73b7943b8f99..29672e9a613e 100644
--- a/sys/contrib/openzfs/module/zfs/dsl_dir.c
+++ b/sys/contrib/openzfs/module/zfs/dsl_dir.c
@@ -121,13 +121,6 @@
* and updated by dsl_fs_ss_count_adjust(). A new limit value is setup in
* dsl_dir_activate_fs_ss_limit() and the counts are adjusted, if necessary, by
* dsl_dir_init_fs_ss_count().
- *
- * There is a special case when we receive a filesystem that already exists. In
- * this case a temporary clone name of %X is created (see dmu_recv_begin). We
- * never update the filesystem counts for temporary clones.
- *
- * Likewise, we do not update the snapshot counts for temporary snapshots,
- * such as those created by zfs diff.
*/
extern inline dsl_dir_phys_t *dsl_dir_phys(dsl_dir_t *dd);
@@ -593,11 +586,9 @@ dsl_dir_init_fs_ss_count(dsl_dir_t *dd, dmu_tx_t *tx)
&chld_dd));
/*
- * Ignore hidden ($FREE, $MOS & $ORIGIN) objsets and
- * temporary datasets.
+ * Ignore hidden ($FREE, $MOS & $ORIGIN) objsets.
*/
- if (chld_dd->dd_myname[0] == '$' ||
- chld_dd->dd_myname[0] == '%') {
+ if (chld_dd->dd_myname[0] == '$') {
dsl_dir_rele(chld_dd, FTAG);
continue;
}
@@ -910,14 +901,12 @@ dsl_fs_ss_count_adjust(dsl_dir_t *dd, int64_t delta, const char *prop,
strcmp(prop, DD_FIELD_SNAPSHOT_COUNT) == 0);
/*
- * When we receive an incremental stream into a filesystem that already
- * exists, a temporary clone is created. We don't count this temporary
- * clone, whose name begins with a '%'. We also ignore hidden ($FREE,
- * $MOS & $ORIGIN) objsets.
+ * We don't do accounting for hidden ($FREE, $MOS & $ORIGIN) objsets.
*/
- if ((dd->dd_myname[0] == '%' || dd->dd_myname[0] == '$') &&
- strcmp(prop, DD_FIELD_FILESYSTEM_COUNT) == 0)
+ if (dd->dd_myname[0] == '$' && strcmp(prop,
+ DD_FIELD_FILESYSTEM_COUNT) == 0) {
return;
+ }
/*
* e.g. if renaming a dataset with no snapshots, count adjustment is 0