diff options
| author | Brian Behlendorf <[email protected]> | 2009-07-09 12:23:41 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-07-09 12:23:41 -0700 |
| commit | c4c4afd8fdea6fad8595a6609d47f75e8083f71d (patch) | |
| tree | 9fae669a979cc5e98fb0f203f11d4808f4631660 /module/zfs/dsl_prop.c | |
| parent | e5e94c40f7acbff46e0141360e523a28a2f8330c (diff) | |
| parent | 6db8882b78334225baa44e755439f7542dd5ccd5 (diff) | |
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
Diffstat (limited to 'module/zfs/dsl_prop.c')
| -rw-r--r-- | module/zfs/dsl_prop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/dsl_prop.c b/module/zfs/dsl_prop.c index c26c3ff27..526fb5cc4 100644 --- a/module/zfs/dsl_prop.c +++ b/module/zfs/dsl_prop.c @@ -368,7 +368,7 @@ dsl_prop_set_sync(void *arg1, void *arg2, cred_t *cr, dmu_tx_t *tx) if (psa->numints == 0) { int err = zap_remove(mos, zapobj, psa->name, tx); - VERIFY(0 == err || ENOENT == err); + VERIFY(err == 0 || err == ENOENT); if (isint) { VERIFY(0 == dsl_prop_get_ds(ds, psa->name, 8, 1, &intval, NULL)); |