diff options
| author | Matthew Ahrens <[email protected]> | 2014-04-15 19:40:22 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-07-30 09:20:35 -0700 |
| commit | 9bd274ddd846cd4024ebe3253c7b2d4f3b6f9dc0 (patch) | |
| tree | 81da771b7588f8585fca225f38a32f605a3486a1 /module/zfs/vdev_disk.c | |
| parent | da536844d55b2f3aaefdaebd36fb97bb867494aa (diff) | |
Illumos #4374
4374 dn_free_ranges should use range_tree_t
Reviewed by: George Wilson <[email protected]>
Reviewed by: Max Grossman <[email protected]>
Reviewed by: Christopher Siden <[email protected]
Reviewed by: Garrett D'Amore <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Approved by: Dan McDonald <[email protected]>
References:
https://www.illumos.org/issues/4374
https://github.com/illumos/illumos-gate/commit/bf16b11
Ported by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2531
Diffstat (limited to 'module/zfs/vdev_disk.c')
| -rw-r--r-- | module/zfs/vdev_disk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c index ee14165f5..9cc6745d1 100644 --- a/module/zfs/vdev_disk.c +++ b/module/zfs/vdev_disk.c @@ -23,7 +23,7 @@ * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). * Rewritten for Linux by Brian Behlendorf <[email protected]>. * LLNL-CODE-403049. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2012, 2014 by Delphix. All rights reserved. */ #include <sys/zfs_context.h> @@ -308,7 +308,7 @@ skip_open: *max_psize = *psize; /* Based on the minimum sector size set the block size */ - *ashift = highbit(MAX(block_size, SPA_MINBLOCKSIZE)) - 1; + *ashift = highbit64(MAX(block_size, SPA_MINBLOCKSIZE)) - 1; /* Try to set the io scheduler elevator algorithm */ (void) vdev_elevator_switch(v, zfs_vdev_scheduler); |