diff options
| author | Brian Behlendorf <[email protected]> | 2012-11-15 11:43:54 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-11-15 11:51:23 -0800 |
| commit | 54602c37718eca0dbeb668321edf5dfc41dcbe93 (patch) | |
| tree | 1dcd5fc3ccef64e881c660dd68fb752ac56b4147 /module/zfs/zfs_fm.c | |
| parent | 3997bc74351d608e1a09f8ba8d58fb1c12fff331 (diff) | |
| parent | df83110856950c8e7b16a7e94cdf42b8531b9cc8 (diff) | |
Merge branch 'ashift'
This branch adds some overdue ashift improvements.
* Add '-o ashift' to 'zpool add' and 'zpool attach'
* Improve AF hard disk detection
* Allow 'zpool import' to handle increases in ashift
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'module/zfs/zfs_fm.c')
| -rw-r--r-- | module/zfs/zfs_fm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/module/zfs/zfs_fm.c b/module/zfs/zfs_fm.c index db6a831d2..820291bf4 100644 --- a/module/zfs/zfs_fm.c +++ b/module/zfs/zfs_fm.c @@ -267,6 +267,10 @@ zfs_ereport_start(nvlist_t **ereport_out, nvlist_t **detector_out, fm_payload_set(ereport, FM_EREPORT_PAYLOAD_ZFS_VDEV_FRU, DATA_TYPE_STRING, vd->vdev_fru, NULL); + if (vd->vdev_ashift) + fm_payload_set(ereport, + FM_EREPORT_PAYLOAD_ZFS_VDEV_ASHIFT, + DATA_TYPE_UINT64, vd->vdev_ashift, NULL); if (pvd != NULL) { fm_payload_set(ereport, |