diff options
| author | Matthew Ahrens <mahrens@delphix.com> | 2014-04-15 19:40:22 -0800 |
|---|---|---|
| committer | Christopher Siden <chris@delphix.com> | 2014-04-15 20:40:22 -0700 |
| commit | bf16b11e8deb633dd6c4296d46e92399d1582df4 (patch) | |
| tree | 480bab5d2a9eb6f4e0fcfa7fec413b48a5799f55 /usr/src/uts/common/fs/zfs/vdev_disk.c | |
| parent | 7266c4fdd3d819c74f84745da19a4eb34bd75f2d (diff) | |
| download | illumos-joyent-bf16b11e8deb633dd6c4296d46e92399d1582df4.tar.gz | |
4374 dn_free_ranges should use range_tree_t
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src/uts/common/fs/zfs/vdev_disk.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/vdev_disk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/vdev_disk.c b/usr/src/uts/common/fs/zfs/vdev_disk.c index 22e376d3ea..3a4bc20f5b 100644 --- a/usr/src/uts/common/fs/zfs/vdev_disk.c +++ b/usr/src/uts/common/fs/zfs/vdev_disk.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2012, 2014 by Delphix. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2013 Joyent, Inc. All rights reserved. */ @@ -547,7 +547,7 @@ skip_open: pbsize = DEV_BSIZE; } - *ashift = highbit(MAX(pbsize, SPA_MINBLOCKSIZE)) - 1; + *ashift = highbit64(MAX(pbsize, SPA_MINBLOCKSIZE)) - 1; if (vd->vdev_wholedisk == 1) { int wce = 1; |