Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
This commit is contained in:
commit
7c56a7d623
|
@ -411,7 +411,7 @@ top:
|
|||
|
||||
if (zs) {
|
||||
if (reset) {
|
||||
zstream_t *remove = zs;
|
||||
zstream_t *rm = zs;
|
||||
|
||||
rc = 0;
|
||||
mutex_exit(&zs->zst_lock);
|
||||
|
@ -423,7 +423,7 @@ top:
|
|||
*/
|
||||
for (zs = list_head(&zf->zf_stream); zs;
|
||||
zs = list_next(&zf->zf_stream, zs)) {
|
||||
if (zs == remove) {
|
||||
if (zs == rm) {
|
||||
dmu_zfetch_stream_remove(zf, zs);
|
||||
mutex_destroy(&zs->zst_lock);
|
||||
kmem_free(zs, sizeof (zstream_t));
|
||||
|
|
Loading…
Reference in New Issue