c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 19:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Illumos #3743

Browse Source 
3743 zfs needs a refcount audit
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Christopher Siden <christopher.siden@delphix.com>

References:
  https://www.illumos.org/issues/3743
  illumos/illumos-gate@b287be1ba8

Ported-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #1775
This commit is contained in:
Will Andrews 2013-06-11 09:13:38 -08:00 committed by Brian Behlendorf
parent d3cc8b152e
commit 3a84951d7d
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zfs/dsl_dataset.c
View File

@ -360,8 +360,10 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uint64_t dsobj, void *tag,
/* Make sure dsobj has the correct object type. */ /* Make sure dsobj has the correct object type. */
dmu_object_info_from_db(dbuf, &doi); dmu_object_info_from_db(dbuf, &doi);
if (doi.doi_type != DMU_OT_DSL_DATASET) if (doi.doi_type != DMU_OT_DSL_DATASET) {
dmu_buf_rele(dbuf, tag);
return (SET_ERROR(EINVAL)); return (SET_ERROR(EINVAL));
}
ds = dmu_buf_get_user(dbuf); ds = dmu_buf_get_user(dbuf);
if (ds == NULL) { if (ds == NULL) {

4
module/zfs/spa_errlog.c
View File

@ -183,8 +183,10 @@ process_error_log(spa_t *spa, uint64_t obj, void *addr, size_t *count)
if (copyout(&zb, (char *)addr + if (copyout(&zb, (char *)addr +
(*count - 1) * sizeof (zbookmark_t), (*count - 1) * sizeof (zbookmark_t),
sizeof (zbookmark_t)) != 0) sizeof (zbookmark_t)) != 0) {
zap_cursor_fini(&zc);
return (SET_ERROR(EFAULT)); return (SET_ERROR(EFAULT));
}
*count -= 1; *count -= 1;
} }

36
module/zfs/zap.c
View File

@ -295,6 +295,7 @@ zap_table_load(zap_t *zap, zap_table_phys_t *tbl, uint64_t idx, uint64_t *valp)
err = dmu_buf_hold(zap->zap_objset, zap->zap_object, err = dmu_buf_hold(zap->zap_objset, zap->zap_object,
(tbl->zt_nextblk + blk) << bs, FTAG, &db, (tbl->zt_nextblk + blk) << bs, FTAG, &db,
DMU_READ_NO_PREFETCH); DMU_READ_NO_PREFETCH);
if (err == 0)
dmu_buf_rele(db, FTAG); dmu_buf_rele(db, FTAG);
} }
return (err); return (err);
@ -992,18 +993,21 @@ zap_join(objset_t *os, uint64_t fromobj, uint64_t intoobj, dmu_tx_t *tx)
zap_attribute_t za; zap_attribute_t za;
int err; int err;
err = 0;
for (zap_cursor_init(&zc, os, fromobj); for (zap_cursor_init(&zc, os, fromobj);
zap_cursor_retrieve(&zc, &za) == 0; zap_cursor_retrieve(&zc, &za) == 0;
(void) zap_cursor_advance(&zc)) { (void) zap_cursor_advance(&zc)) {
if (za.za_integer_length != 8 || za.za_num_integers != 1) if (za.za_integer_length != 8 || za.za_num_integers != 1) {
return (SET_ERROR(EINVAL)); err = SET_ERROR(EINVAL);
break;
}
err = zap_add(os, intoobj, za.za_name, err = zap_add(os, intoobj, za.za_name,
8, 1, &za.za_first_integer, tx); 8, 1, &za.za_first_integer, tx);
if (err) if (err)
return (err); break;
} }
zap_cursor_fini(&zc); zap_cursor_fini(&zc);
return (0); return (err);
} }
int int
@ -1014,18 +1018,21 @@ zap_join_key(objset_t *os, uint64_t fromobj, uint64_t intoobj,
zap_attribute_t za; zap_attribute_t za;
int err; int err;
err = 0;
for (zap_cursor_init(&zc, os, fromobj); for (zap_cursor_init(&zc, os, fromobj);
zap_cursor_retrieve(&zc, &za) == 0; zap_cursor_retrieve(&zc, &za) == 0;
(void) zap_cursor_advance(&zc)) { (void) zap_cursor_advance(&zc)) {
if (za.za_integer_length != 8 || za.za_num_integers != 1) if (za.za_integer_length != 8 || za.za_num_integers != 1) {
return (SET_ERROR(EINVAL)); err = SET_ERROR(EINVAL);
break;
}
err = zap_add(os, intoobj, za.za_name, err = zap_add(os, intoobj, za.za_name,
8, 1, &value, tx); 8, 1, &value, tx);
if (err) if (err)
return (err); break;
} }
zap_cursor_fini(&zc); zap_cursor_fini(&zc);
return (0); return (err);
} }
int int
@ -1036,24 +1043,27 @@ zap_join_increment(objset_t *os, uint64_t fromobj, uint64_t intoobj,
zap_attribute_t za; zap_attribute_t za;
int err; int err;
err = 0;
for (zap_cursor_init(&zc, os, fromobj); for (zap_cursor_init(&zc, os, fromobj);
zap_cursor_retrieve(&zc, &za) == 0; zap_cursor_retrieve(&zc, &za) == 0;
(void) zap_cursor_advance(&zc)) { (void) zap_cursor_advance(&zc)) {
uint64_t delta = 0; uint64_t delta = 0;
if (za.za_integer_length != 8 || za.za_num_integers != 1) if (za.za_integer_length != 8 || za.za_num_integers != 1) {
return (SET_ERROR(EINVAL)); err = SET_ERROR(EINVAL);
break;
}
err = zap_lookup(os, intoobj, za.za_name, 8, 1, &delta); err = zap_lookup(os, intoobj, za.za_name, 8, 1, &delta);
if (err != 0 && err != ENOENT) if (err != 0 && err != ENOENT)
return (err); break;
delta += za.za_first_integer; delta += za.za_first_integer;
err = zap_update(os, intoobj, za.za_name, 8, 1, &delta, tx); err = zap_update(os, intoobj, za.za_name, 8, 1, &delta, tx);
if (err) if (err)
return (err); break;
} }
zap_cursor_fini(&zc); zap_cursor_fini(&zc);
return (0); return (err);
} }
int int