d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV 266913+266914:

Browse Source 
3897 zfs filesystem and snapshot limits (fix leak)
4901 zfs filesystem/snapshot limit leaks

MFC after:	3 days
This commit is contained in:
Xin LI 2014-05-31 01:00:22 +00:00
commit f4c7dd6dd0
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
View File

@ -489,7 +489,7 @@ dsl_dir_init_fs_ss_count(dsl_dir_t *dd, dmu_tx_t *tx)
zap_attribute_t *za; zap_attribute_t *za;
dsl_dataset_t *ds; dsl_dataset_t *ds;
ASSERT(spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_FS_SS_LIMIT)); ASSERT(spa_feature_is_active(dp->dp_spa, SPA_FEATURE_FS_SS_LIMIT));
ASSERT(dsl_pool_config_held(dp)); ASSERT(dsl_pool_config_held(dp));
ASSERT(dmu_tx_is_syncing(tx)); ASSERT(dmu_tx_is_syncing(tx));
@ -549,6 +549,7 @@ dsl_dir_init_fs_ss_count(dsl_dir_t *dd, dmu_tx_t *tx)
if (za->za_name[0] != '%') if (za->za_name[0] != '%')
my_ss_cnt++; my_ss_cnt++;
} }
zap_cursor_fini(zc);
dsl_dataset_rele(ds, FTAG); dsl_dataset_rele(ds, FTAG);
@ -1717,7 +1718,7 @@ dsl_dir_rename_check(void *arg, dmu_tx_t *tx)
} }
if (dmu_tx_is_syncing(tx)) { if (dmu_tx_is_syncing(tx)) {
if (spa_feature_is_enabled(dp->dp_spa, if (spa_feature_is_active(dp->dp_spa,
SPA_FEATURE_FS_SS_LIMIT)) { SPA_FEATURE_FS_SS_LIMIT)) {
/* /*
* Although this is the check function and we don't * Although this is the check function and we don't
@ -1745,8 +1746,11 @@ dsl_dir_rename_check(void *arg, dmu_tx_t *tx)
err = zap_lookup(os, dd->dd_object, err = zap_lookup(os, dd->dd_object,
DD_FIELD_FILESYSTEM_COUNT, sizeof (fs_cnt), 1, DD_FIELD_FILESYSTEM_COUNT, sizeof (fs_cnt), 1,
&fs_cnt); &fs_cnt);
if (err != ENOENT && err != 0) if (err != ENOENT && err != 0) {
dsl_dir_rele(newparent, FTAG);
dsl_dir_rele(dd, FTAG);
return (err); return (err);
}
/* /*
* have to add 1 for the filesystem itself that we're * have to add 1 for the filesystem itself that we're
@ -1757,8 +1761,11 @@ dsl_dir_rename_check(void *arg, dmu_tx_t *tx)
err = zap_lookup(os, dd->dd_object, err = zap_lookup(os, dd->dd_object,
DD_FIELD_SNAPSHOT_COUNT, sizeof (ss_cnt), 1, DD_FIELD_SNAPSHOT_COUNT, sizeof (ss_cnt), 1,
&ss_cnt); &ss_cnt);
if (err != ENOENT && err != 0) if (err != ENOENT && err != 0) {
dsl_dir_rele(newparent, FTAG);
dsl_dir_rele(dd, FTAG);
return (err); return (err);
}
} }
/* no rename into our descendant */ /* no rename into our descendant */
@ -1809,7 +1816,7 @@ dsl_dir_rename_sync(void *arg, dmu_tx_t *tx)
* We already made sure the dd counts were initialized in the * We already made sure the dd counts were initialized in the
* check function. * check function.
*/ */
if (spa_feature_is_enabled(dp->dp_spa, if (spa_feature_is_active(dp->dp_spa,
SPA_FEATURE_FS_SS_LIMIT)) { SPA_FEATURE_FS_SS_LIMIT)) {
VERIFY0(zap_lookup(os, dd->dd_object, VERIFY0(zap_lookup(os, dd->dd_object,
DD_FIELD_FILESYSTEM_COUNT, sizeof (fs_cnt), 1, DD_FIELD_FILESYSTEM_COUNT, sizeof (fs_cnt), 1,