diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-07-21 03:30:52 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-07-21 03:30:52 +0000 |
| commit | d9af4e84774a947af9681da96bc3c82f97524ae2 (patch) | |
| tree | 482d92ad562b7911b757ca01535a665657d0954f /sys/dev/softraid_raid1.c | |
| parent | 84b53c6a941bcec39805f48f8c3282697bdd1558 (diff) | |
A few more daddr_t fixes. Rename 'phys_off' variables to 'offset'
since they are now relative to chunks. Use 'blkno' as normal variable
name for daddr_t items rather than mix of 'blkno, blk, offset.
Change field name ssd_data_offset to ssd_data_blkno since it is a
block and not byte quantity.
No intentional functional change.
Diffstat (limited to 'sys/dev/softraid_raid1.c')
| -rw-r--r-- | sys/dev/softraid_raid1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/softraid_raid1.c b/sys/dev/softraid_raid1.c index 5eceea3cdc4..4bb766bf550 100644 --- a/sys/dev/softraid_raid1.c +++ b/sys/dev/softraid_raid1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raid1.c,v 1.62 2015/07/19 21:06:04 krw Exp $ */ +/* $OpenBSD: softraid_raid1.c,v 1.63 2015/07/21 03:30:51 krw Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * @@ -329,10 +329,10 @@ sr_raid1_rw(struct sr_workunit *wu) struct sr_ccb *ccb; struct sr_chunk *scp; int ios, chunk, i, rt; - daddr_t blk; + daddr_t blkno; - /* blk and scsi error will be handled by sr_validate_io */ - if (sr_validate_io(wu, &blk, "sr_raid1_rw")) + /* blkno and scsi error will be handled by sr_validate_io */ + if (sr_validate_io(wu, &blkno, "sr_raid1_rw")) goto bad; if (xs->flags & SCSI_DATA_IN) @@ -385,7 +385,7 @@ ragain: } } - ccb = sr_ccb_rw(sd, chunk, blk, xs->datalen, xs->data, + ccb = sr_ccb_rw(sd, chunk, blkno, xs->datalen, xs->data, xs->flags, 0); if (!ccb) { /* should never happen but handle more gracefully */ |