diff options
| author | pjd <pjd@FreeBSD.org> | 2004-09-28 07:33:37 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2004-09-28 07:33:37 +0000 |
| commit | 63dd0f756be07fcbaa764dfb7930f49f32d41de7 (patch) | |
| tree | 44982f9aecc1ddf9c2fd83f432924589e487affc /sys/geom/raid3 | |
| parent | 9f0701f21f891873b4762df032c61da73a76dd24 (diff) | |
| download | FreeBSD-src-63dd0f756be07fcbaa764dfb7930f49f32d41de7.zip FreeBSD-src-63dd0f756be07fcbaa764dfb7930f49f32d41de7.tar.gz | |
Just use MAXPHYS as maximum I/O request size, instead of using my own
#define for this purpose.
No functional change.
Diffstat (limited to 'sys/geom/raid3')
| -rw-r--r-- | sys/geom/raid3/g_raid3.c | 10 | ||||
| -rw-r--r-- | sys/geom/raid3/g_raid3.h | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 53f9858..36c0dd5 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -1229,8 +1229,7 @@ g_raid3_sync_one(struct g_raid3_softc *sc) bp->bio_parent = NULL; bp->bio_cmd = BIO_READ; bp->bio_offset = disk->d_sync.ds_offset * (sc->sc_ndisks - 1); - bp->bio_length = MIN(G_RAID3_MAX_IO_SIZE, - sc->sc_mediasize - bp->bio_offset); + bp->bio_length = MIN(MAXPHYS, sc->sc_mediasize - bp->bio_offset); bp->bio_cflags = 0; bp->bio_done = g_raid3_sync_done; bp->bio_data = disk->d_sync.ds_data; @@ -1347,8 +1346,7 @@ g_raid3_sync_request(struct bio *bp) g_raid3_event_send(disk, G_RAID3_DISK_STATE_ACTIVE, G_RAID3_EVENT_DONTWAIT); return; - } else if (sync->ds_offset_done % - (G_RAID3_MAX_IO_SIZE * 100) == 0) { + } else if (sync->ds_offset_done % (MAXPHYS * 100) == 0) { /* * Update offset_done on every 100 blocks. * XXX: This should be configurable. @@ -1425,7 +1423,7 @@ g_raid3_register_request(struct bio *pbp) break; if (offset >= sync->ds_resync && sync->ds_resync != -1) break; - sync->ds_resync = offset - (offset % G_RAID3_MAX_IO_SIZE); + sync->ds_resync = offset - (offset % MAXPHYS); break; } } @@ -1830,7 +1828,7 @@ g_raid3_sync_start(struct g_raid3_softc *sc) error = g_access(disk->d_sync.ds_consumer, 1, 0, 0); KASSERT(error == 0, ("Cannot open %s (error=%d).", disk->d_softc->sc_name, error)); - disk->d_sync.ds_data = malloc(G_RAID3_MAX_IO_SIZE, M_RAID3, M_WAITOK); + disk->d_sync.ds_data = malloc(MAXPHYS, M_RAID3, M_WAITOK); sc->sc_syncdisk = disk; } diff --git a/sys/geom/raid3/g_raid3.h b/sys/geom/raid3/g_raid3.h index f28acb8..948d599 100644 --- a/sys/geom/raid3/g_raid3.h +++ b/sys/geom/raid3/g_raid3.h @@ -84,8 +84,6 @@ extern u_int g_raid3_debug; } \ } while (0) -#define G_RAID3_MAX_IO_SIZE (DFLTPHYS * 2) - #define G_RAID3_BIO_CFLAG_REGULAR 0x01 #define G_RAID3_BIO_CFLAG_SYNC 0x02 #define G_RAID3_BIO_CFLAG_PARITY 0x04 |
