diff options
| author |   krw <krw@openbsd.org> | 2020-02-13 15:11:32 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-02-13 15:11:32 +0000 |
| commit | f4b58f5aed2fc151bbb9cee8f4b3a60a5eafd46c (patch) | |
| tree | da4cc1d7c313b2ebe34b0f3e4e58578b4a6785c0 /sys/dev/softraid.c | |
| parent | remove macros which defined extern "C" for C++ (diff) | |
| download | wireguard-openbsd-f4b58f5aed2fc151bbb9cee8f4b3a60a5eafd46c.tar.xz wireguard-openbsd-f4b58f5aed2fc151bbb9cee8f4b3a60a5eafd46c.zip | |
Nuke *_minphys() functions that either simply apply MAXPHYS or do
nothing at all. MAXPHYS will be applied in minphys() and nothing at
all, well, doesn't do anything.
Also remove any '#define <blah> MAXPHYS' statements used solely to
disguise MAXPHYS in said functions.
Diffstat (limited to 'sys/dev/softraid.c')
| -rw-r--r-- | sys/dev/softraid.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 746e740eabd..83667e7eda9 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.397 2020/01/25 21:48:42 krw Exp $ */ +/* $OpenBSD: softraid.c,v 1.398 2020/02/13 15:11:32 krw Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -93,7 +93,6 @@ struct cfdriver softraid_cd = { /* scsi & discipline */ void sr_scsi_cmd(struct scsi_xfer *); -void sr_minphys(struct buf *, struct scsi_link *); int sr_scsi_probe(struct scsi_link *); void sr_copy_internal_data(struct scsi_xfer *, void *, size_t); @@ -179,7 +178,7 @@ extern void (*softraid_disk_attach)(struct disk *, int); /* scsi glue */ struct scsi_adapter sr_switch = { - sr_scsi_cmd, sr_minphys, sr_scsi_probe, NULL, sr_scsi_ioctl + sr_scsi_cmd, NULL, sr_scsi_probe, NULL, sr_scsi_ioctl }; /* native metadata format */ @@ -1887,16 +1886,6 @@ sr_error(struct sr_softc *sc, const char *fmt, ...) } void -sr_minphys(struct buf *bp, struct scsi_link *sl) -{ - DNPRINTF(SR_D_MISC, "sr_minphys: %ld\n", bp->b_bcount); - - /* XXX currently using SR_MAXFER = MAXPHYS */ - if (bp->b_bcount > SR_MAXFER) - bp->b_bcount = SR_MAXFER; -} - -void sr_copy_internal_data(struct scsi_xfer *xs, void *v, size_t size) { size_t copy_cnt; |