@@ -6332,12 +6332,10 @@ arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
6332
6332
} else {
6333
6333
abd = hdr_abd ;
6334
6334
}
6335
- boolean_t large_label = vd -> vdev_large_label ;
6336
6335
6337
- ASSERT (addr >=
6338
- VDEV_LABEL_START_SIZE (large_label ) &&
6336
+ ASSERT (addr >= VDEV_LABEL_START_SIZE (vd ) &&
6339
6337
addr + asize <= vd -> vdev_psize -
6340
- VDEV_LABEL_END_SIZE (large_label ));
6338
+ VDEV_LABEL_END_SIZE (vd ));
6341
6339
6342
6340
/*
6343
6341
* l2arc read. The SCL_L2ARC lock will be
@@ -9173,7 +9171,7 @@ l2arc_evict(l2arc_dev_t *dev, uint64_t distance, boolean_t all)
9173
9171
*/
9174
9172
spa_config_exit (dev -> l2ad_spa , SCL_L2ARC , dev );
9175
9173
vdev_trim_simple (vd , dev -> l2ad_evict -
9176
- VDEV_LABEL_START_SIZE (vd -> vdev_large_label ),
9174
+ VDEV_LABEL_START_SIZE (vd ),
9177
9175
taddr - dev -> l2ad_evict );
9178
9176
spa_config_enter (dev -> l2ad_spa , SCL_L2ARC , dev ,
9179
9177
RW_READER );
@@ -9979,10 +9977,8 @@ l2arc_add_vdev(spa_t *spa, vdev_t *vd)
9979
9977
/* leave extra size for an l2arc device header */
9980
9978
l2dhdr_asize = adddev -> l2ad_dev_hdr_asize =
9981
9979
MAX (sizeof (* adddev -> l2ad_dev_hdr ), 1 << vd -> vdev_ashift );
9982
- adddev -> l2ad_start = VDEV_LABEL_START_SIZE (vd -> vdev_large_label ) +
9983
- l2dhdr_asize ;
9984
- adddev -> l2ad_end = VDEV_LABEL_START_SIZE (vd -> vdev_large_label ) +
9985
- vdev_get_min_asize (vd );
9980
+ adddev -> l2ad_start = VDEV_LABEL_START_SIZE (vd ) + l2dhdr_asize ;
9981
+ adddev -> l2ad_end = VDEV_LABEL_START_SIZE (vd ) + vdev_get_min_asize (vd );
9986
9982
ASSERT3U (adddev -> l2ad_start , < , adddev -> l2ad_end );
9987
9983
adddev -> l2ad_hand = adddev -> l2ad_start ;
9988
9984
adddev -> l2ad_evict = adddev -> l2ad_start ;
@@ -10541,17 +10537,17 @@ l2arc_dev_hdr_read(l2arc_dev_t *dev)
10541
10537
const uint64_t l2dhdr_asize = dev -> l2ad_dev_hdr_asize ;
10542
10538
abd_t * abd ;
10543
10539
vdev_t * vd = dev -> l2ad_vdev ;
10544
- boolean_t large_label = vd ? vd -> vdev_large_label :
10545
- B_FALSE ;
10540
+ uint64_t offset = vd ? VDEV_LABEL_START_SIZE ( vd ) :
10541
+ VDEV_OLD_LABEL_START_SIZE ;
10546
10542
10547
10543
guid = spa_guid (dev -> l2ad_vdev -> vdev_spa );
10548
10544
10549
10545
abd = abd_get_from_buf (l2dhdr , l2dhdr_asize );
10550
10546
10551
- err = zio_wait (zio_read_phys (NULL , dev -> l2ad_vdev ,
10552
- VDEV_LABEL_START_SIZE ( large_label ), l2dhdr_asize , abd ,
10553
- ZIO_CHECKSUM_LABEL , NULL , NULL , ZIO_PRIORITY_SYNC_READ ,
10554
- ZIO_FLAG_CANFAIL | ZIO_FLAG_DONT_PROPAGATE | ZIO_FLAG_DONT_RETRY |
10547
+ err = zio_wait (zio_read_phys (NULL , dev -> l2ad_vdev , offset ,
10548
+ l2dhdr_asize , abd , ZIO_CHECKSUM_LABEL , NULL , NULL ,
10549
+ ZIO_PRIORITY_SYNC_READ , ZIO_FLAG_CANFAIL |
10550
+ ZIO_FLAG_DONT_PROPAGATE | ZIO_FLAG_DONT_RETRY |
10555
10551
ZIO_FLAG_SPECULATIVE , B_FALSE ));
10556
10552
10557
10553
abd_free (abd );
@@ -10905,8 +10901,8 @@ l2arc_dev_hdr_update(l2arc_dev_t *dev)
10905
10901
abd_t * abd ;
10906
10902
int err ;
10907
10903
vdev_t * vd = dev -> l2ad_vdev ;
10908
- boolean_t large_label = vd ? vd -> vdev_large_label :
10909
- B_FALSE ;
10904
+ uint64_t offset = vd ? VDEV_LABEL_START_SIZE ( vd ) :
10905
+ VDEV_OLD_LABEL_START_SIZE ;
10910
10906
10911
10907
VERIFY (spa_config_held (dev -> l2ad_spa , SCL_STATE_ALL , RW_READER ));
10912
10908
@@ -10929,9 +10925,8 @@ l2arc_dev_hdr_update(l2arc_dev_t *dev)
10929
10925
abd = abd_get_from_buf (l2dhdr , l2dhdr_asize );
10930
10926
10931
10927
err = zio_wait (zio_write_phys (NULL , dev -> l2ad_vdev ,
10932
- VDEV_LABEL_START_SIZE (large_label ), l2dhdr_asize , abd ,
10933
- ZIO_CHECKSUM_LABEL , NULL , NULL , ZIO_PRIORITY_ASYNC_WRITE ,
10934
- ZIO_FLAG_CANFAIL , B_FALSE ));
10928
+ offset , l2dhdr_asize , abd , ZIO_CHECKSUM_LABEL , NULL , NULL ,
10929
+ ZIO_PRIORITY_ASYNC_WRITE , ZIO_FLAG_CANFAIL , B_FALSE ));
10935
10930
10936
10931
abd_free (abd );
10937
10932
0 commit comments