d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix several fallouts from r320156, ZFS ABD import

Browse Source 
All of the problems were related to the FreeBSD-only features.
One was caused by a mismerge in the zfsbootcfg support code.
All others were in the TRIM support code.

MFC after:	1 week
X-MFC with:	r320156
This commit is contained in:
Andriy Gapon 2017-06-21 08:12:07 +00:00
parent ebf3b53dac
commit a4a2976d8a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
View File

@ -912,7 +912,7 @@ retry:
goto retry;
}
zio_buf_free(pad2, VDEV_PAD_SIZE);
abd_free(pad2);
return (error);
}