diff options
| author | mm <mm@FreeBSD.org> | 2013-02-11 12:42:11 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-02-11 12:42:11 +0000 |
| commit | 22ab64ccb2461dded21f4c8a09029daf1027c2f8 (patch) | |
| tree | 2649bc26255ec262bbcca7821c20460caff57c0d /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c | |
| parent | 3647f040d3f9d32573905dc01b99edcd0493cbf7 (diff) | |
| download | FreeBSD-src-22ab64ccb2461dded21f4c8a09029daf1027c2f8.zip FreeBSD-src-22ab64ccb2461dded21f4c8a09029daf1027c2f8.tar.gz | |
MFV r246392:
Import vendor ZFS bugfix fixing a possible deadlock in arc_read().
Illumos ZFS issues:
3498 panic in arc_read(): !refcount_is_zero(&pbuf->b_hdr->b_refcnt)
References:
https://www.illumos.org/issues/3498
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c index e5d159b..48edcbf 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c @@ -267,7 +267,7 @@ struct maparg { /*ARGSUSED*/ static int -zvol_map_block(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf, +zvol_map_block(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg) { struct maparg *ma = arg; |
