Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix zap_update() ASSERT from ztest 

This patch simply removes an invalid assert from the zap_update()
function. The ASSERT is invalid because it does not hold the zap
lock from the time it fetches the old value to the time it confirms
that it is what it should be.

Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes #8209
This commit is contained in:
Tom Caputi 2018-12-14 13:04:11 -05:00 committed by Brian Behlendorf
parent 0dd6b6bfcb
commit 2a6078450d
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module/zfs/zap_micro.c
View File

@ -1283,19 +1283,8 @@ zap_update(objset_t *os, uint64_t zapobj, const char *name,
int integer_size, uint64_t num_integers, const void *val, dmu_tx_t *tx) int integer_size, uint64_t num_integers, const void *val, dmu_tx_t *tx)
{ {
zap_t *zap; zap_t *zap;
ASSERTV(uint64_t oldval);
const uint64_t *intval = val; const uint64_t *intval = val;
#ifdef ZFS_DEBUG
/*
* If there is an old value, it shouldn't change across the
* lockdir (eg, due to bprewrite's xlation).
*/
if (integer_size == 8 && num_integers == 1)
(void) zap_lookup(os, zapobj, name, 8, 1, &oldval);
#endif
int err = int err =
zap_lockdir(os, zapobj, tx, RW_WRITER, TRUE, TRUE, FTAG, &zap); zap_lockdir(os, zapobj, tx, RW_WRITER, TRUE, TRUE, FTAG, &zap);
if (err != 0) if (err != 0)
@ -1322,7 +1311,6 @@ zap_update(objset_t *os, uint64_t zapobj, const char *name,
} else { } else {
mzap_ent_t *mze = mze_find(zn); mzap_ent_t *mze = mze_find(zn);
if (mze != NULL) { if (mze != NULL) {
ASSERT3U(MZE_PHYS(zap, mze)->mze_value, ==, oldval);
MZE_PHYS(zap, mze)->mze_value = *intval; MZE_PHYS(zap, mze)->mze_value = *intval;
} else { } else {
mzap_addent(zn, *intval); mzap_addent(zn, *intval);