diff options
| author | Mike Gerdts <mike.gerdts@joyent.com> | 2019-06-11 04:05:22 +0000 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2019-06-21 18:03:31 -0400 |
| commit | b73ccab03ec36581b1ae5945ef1fee1d06c79ccf (patch) | |
| tree | f1c4869b6f166226abc7054f914f0aab7f9cbb81 /usr/src/cmd | |
| parent | 29d33d4278d4226572dfc214775224334bc444a6 (diff) | |
| download | illumos-joyent-b73ccab03ec36581b1ae5945ef1fee1d06c79ccf.tar.gz | |
9318 vol_volsize_to_reservation does not account for raidz skip blocks
Reviewed by: Richard Elling <Richard.Elling@RichardElling.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed by: Kody Kantor <kody.kantor@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/zfs/zfs_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index ca11041cba..283f3ff044 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -23,7 +23,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2016 by Delphix. All rights reserved. * Copyright 2012 Milan Jurik. All rights reserved. - * Copyright (c) 2012, Joyent, Inc. All rights reserved. + * Copyright 2019 Joyent, Inc. * Copyright (c) 2011-2012 Pawel Jakub Dawidek. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright (c) 2014 Integros [integros.com] @@ -876,10 +876,11 @@ zfs_do_create(int argc, char **argv) zpool_close(zpool_handle); goto error; } - zpool_close(zpool_handle); - volsize = zvol_volsize_to_reservation(volsize, real_props); + volsize = zvol_volsize_to_reservation(zpool_handle, volsize, + real_props); nvlist_free(real_props); + zpool_close(zpool_handle); if (nvlist_lookup_string(props, zfs_prop_to_name(resv_prop), &strval) != 0) { |