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

Merge commit 'refs/top-bases/fix-branch' into fix-branch

This commit is contained in:
Brian Behlendorf 2010-08-02 13:57:39 -07:00
parent 530190960a f3d8ee7357
commit eeea8d2f06
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/zfs/vdev_cache.c
View File

@ -244,7 +244,7 @@ int
vdev_cache_read(zio_t *zio) vdev_cache_read(zio_t *zio)
{ {
vdev_cache_t *vc = &zio->io_vd->vdev_cache; vdev_cache_t *vc = &zio->io_vd->vdev_cache;
vdev_cache_entry_t *ve, ve_search; vdev_cache_entry_t *ve, *ve_search;
uint64_t cache_offset = P2ALIGN(zio->io_offset, VCBS); uint64_t cache_offset = P2ALIGN(zio->io_offset, VCBS);
uint64_t cache_phase = P2PHASE(zio->io_offset, VCBS); uint64_t cache_phase = P2PHASE(zio->io_offset, VCBS);
zio_t *fio; zio_t *fio;
@ -267,8 +267,10 @@ vdev_cache_read(zio_t *zio)
mutex_enter(&vc->vc_lock); mutex_enter(&vc->vc_lock);
ve_search.ve_offset = cache_offset; ve_search = kmem_alloc(sizeof(vdev_cache_entry_t), KM_SLEEP);
ve = avl_find(&vc->vc_offset_tree, &ve_search, NULL); ve_search->ve_offset = cache_offset;
ve = avl_find(&vc->vc_offset_tree, ve_search, NULL);
kmem_free(ve_search, sizeof(vdev_cache_entry_t));
if (ve != NULL) { if (ve != NULL) {
if (ve->ve_missed_update) { if (ve->ve_missed_update) {