Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl

This commit is contained in:
Brian Behlendorf 2008-12-18 13:27:37 -08:00
commit 7c56a7d623
1 changed files with 2 additions and 2 deletions

View File

@ -411,7 +411,7 @@ top:
if (zs) { if (zs) {
if (reset) { if (reset) {
zstream_t *remove = zs; zstream_t *rm = zs;
rc = 0; rc = 0;
mutex_exit(&zs->zst_lock); mutex_exit(&zs->zst_lock);
@ -423,7 +423,7 @@ top:
*/ */
for (zs = list_head(&zf->zf_stream); zs; for (zs = list_head(&zf->zf_stream); zs;
zs = list_next(&zf->zf_stream, zs)) { zs = list_next(&zf->zf_stream, zs)) {
if (zs == remove) { if (zs == rm) {
dmu_zfetch_stream_remove(zf, zs); dmu_zfetch_stream_remove(zf, zs);
mutex_destroy(&zs->zst_lock); mutex_destroy(&zs->zst_lock);
kmem_free(zs, sizeof (zstream_t)); kmem_free(zs, sizeof (zstream_t));