diff options
| author | delphij <delphij@FreeBSD.org> | 2014-07-15 05:39:22 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-07-15 05:39:22 +0000 |
| commit | 5cce10db7bcae4a96a6910d12d48309059f48318 (patch) | |
| tree | 6d8ba1b5ef631869feba5f76554039388d0c08c6 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c | |
| parent | 4d09e20b956fcbbcb5d1311c44c4e1cee4c3b0e4 (diff) | |
| download | FreeBSD-src-5cce10db7bcae4a96a6910d12d48309059f48318.zip FreeBSD-src-5cce10db7bcae4a96a6910d12d48309059f48318.tar.gz | |
MFC r268123: MFV r268119:
4914 zfs on-disk bookmark structure should be named *_phys_t
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 | 6 |
1 files changed, 3 insertions, 3 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 6ae7cd9..fa607e1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c @@ -23,12 +23,12 @@ * * Copyright (c) 2006-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org> * All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. - * Copyright (c) 2013, Joyent, Inc. All rights reserved. * * Portions Copyright 2010 Robert Milkowski * * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2013, Joyent, Inc. All rights reserved. */ /* Portions Copyright 2011 Martin Matuska <mm@FreeBSD.org> */ @@ -305,7 +305,7 @@ struct maparg { /*ARGSUSED*/ static int zvol_map_block(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, - const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg) + const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg) { struct maparg *ma = arg; zvol_extent_t *ze; |
