diff options
| author | George Wilson <[email protected]> | 2016-01-13 14:37:39 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-01-15 15:38:35 -0800 |
| commit | 59d4c71cca3bd6a1f122129ebb001089f903f182 (patch) | |
| tree | 76e406baabd2034a3ee6600a55a9b29117a8328b /module/zfs/zvol.c | |
| parent | 21f604d4607e9e76a632438ee9274d3a8ce3180d (diff) | |
Illumos 3557, 3558, 3559, 3560
3557 dumpvp_size is not updated correctly when a dump zvol's size is changed
3558 setting the volsize on a dump device does not return back ENOSPC
3559 setting a volsize larger than the space available sometimes succeeds
3560 dumpadm should be able to remove a dump device
Reviewed by: Adam Leventhal <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Christopher Siden <[email protected]>
Approved by: Albert Lee <[email protected]>
References:
https://www.illumos.org/issues/3559
https://github.com/illumos/illumos-gate/commit/c61ea56
Porting notes:
- Internal zvol.c changes not applied due to implementation differences.
The external interface and behavior was already consistent with the
latest upstream code.
- Retired 2.6.28 HAVE_CHECK_DISK_SIZE_CHANGE configure check. All
supported kernels (2.6.32 and newer) provide this interface.
Ported-by: Brian Behlendorf <[email protected]>
Closes #4217
Diffstat (limited to 'module/zfs/zvol.c')
| -rw-r--r-- | module/zfs/zvol.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c index 1e27d81d6..9b7ab542d 100644 --- a/module/zfs/zvol.c +++ b/module/zfs/zvol.c @@ -238,19 +238,9 @@ zvol_size_changed(zvol_state_t *zv, uint64_t volsize) bdev = bdget_disk(zv->zv_disk, 0); if (bdev == NULL) return; -/* - * 2.6.28 API change - * Added check_disk_size_change() helper function. - */ -#ifdef HAVE_CHECK_DISK_SIZE_CHANGE set_capacity(zv->zv_disk, volsize >> 9); zv->zv_volsize = volsize; check_disk_size_change(zv->zv_disk, bdev); -#else - zv->zv_volsize = volsize; - zv->zv_changed = 1; - (void) check_disk_change(bdev); -#endif /* HAVE_CHECK_DISK_SIZE_CHANGE */ bdput(bdev); } |