diff options
| author | ahrens <none@none> | 2006-08-29 15:09:44 -0700 |
|---|---|---|
| committer | ahrens <none@none> | 2006-08-29 15:09:44 -0700 |
| commit | 455d5089097abbf7ee4538a03c4df823497b6e68 (patch) | |
| tree | c47f8102edc64fae1b7480564930ccc01a306865 /usr/src/uts/common/fs/zfs/zap_micro.c | |
| parent | d31ffe9996cf2d1eb9aca6dd983f98f4598cb675 (diff) | |
| download | illumos-gate-455d5089097abbf7ee4538a03c4df823497b6e68.tar.gz | |
6462174 zap_update() likes to return 0
Diffstat (limited to 'usr/src/uts/common/fs/zfs/zap_micro.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zap_micro.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/uts/common/fs/zfs/zap_micro.c b/usr/src/uts/common/fs/zfs/zap_micro.c index 2d3180e37f..c2a79798e0 100644 --- a/usr/src/uts/common/fs/zfs/zap_micro.c +++ b/usr/src/uts/common/fs/zfs/zap_micro.c @@ -211,7 +211,7 @@ mzap_open(objset_t *os, uint64_t obj, dmu_buf_t *db) * it, because zap_lockdir() checks zap_ismicro without the lock * held. */ - winner = dmu_buf_set_user(db, zap, &zap->zap_m.zap_phys, zap_pageout); + winner = dmu_buf_set_user(db, zap, &zap->zap_m.zap_phys, zap_evict); if (winner != NULL) { kmem_free(zap, sizeof (zap_t)); @@ -463,9 +463,9 @@ zap_destroy(objset_t *os, uint64_t zapobj, dmu_tx_t *tx) _NOTE(ARGSUSED(0)) void -zap_pageout(dmu_buf_t *db, void *vmzap) +zap_evict(dmu_buf_t *db, void *vzap) { - zap_t *zap = vmzap; + zap_t *zap = vzap; rw_destroy(&zap->zap_rwlock); @@ -475,7 +475,6 @@ zap_pageout(dmu_buf_t *db, void *vmzap) kmem_free(zap, sizeof (zap_t)); } - int zap_count(objset_t *os, uint64_t zapobj, uint64_t *count) { @@ -672,7 +671,7 @@ zap_update(objset_t *os, uint64_t zapobj, const char *name, } } zap_unlockdir(zap); - return (0); + return (err); } int |