Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
This commit is contained in:
commit
80037044d7
|
@ -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));
|
||||||
|
|
Loading…
Reference in New Issue