Revert a bunch of contraversial changes by PHK. After

a quick think and discussion among various people some form of some of
these changes will probably be recommitted.

The reversion requested was requested by dg while discussions proceed.
PHK has indicated that he can live with this, and it has been agreed
that some form of some of these changes may return shortly after further
discussion.

4 files changed, 7 insertions, 1 deletions

diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index c4a0a8e..7badacb 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -634,6 +634,7 @@ ccdopen(dev, flags, fmt, p)
 	pmask = (1 << part);
 
 	dev->si_bsize_phys = DEV_BSIZE;
+	dev->si_bsize_best = BLKDEV_IOSIZE;
 	dev->si_bsize_max = MAXBSIZE;
 
 	/*
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 539569d..7704cca 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -1227,6 +1227,7 @@ Fdopen(dev_t dev, int flags, int mode, struct proc *p)
 	fdc_p	fdc;
 
 	dev->si_bsize_phys = DEV_BSIZE;
+	dev->si_bsize_best = BLKDEV_IOSIZE;
 	dev->si_bsize_max = MAXBSIZE;
 	/* check bounds */
 	if ((fd = devclass_get_softc(fd_devclass, fdu)) == 0)
diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c
index 46ff86a..2482185 100644
--- a/sys/dev/vinum/vinum.c
+++ b/sys/dev/vinum/vinum.c
@@ -269,6 +269,7 @@ vinumopen(dev_t dev,
 
     devminor = minor(dev);
     dev->si_bsize_phys = DEV_BSIZE;
+    dev->si_bsize_best = VINUM_BSIZE_BEST;		    /* kludge until we track drive block sizes */
     dev->si_bsize_max = MAXBSIZE;
     error = 0;
     /* First, decide what we're looking at */
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 199c804..f51efca 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -510,7 +510,10 @@ vniocattach_file(vn, vio, dev, flag, p)
 		(void) vn_close(nd.ni_vp, flags, p->p_ucred, p);
 		return(error);
 	}
-	dev->si_bsize_phys = vn->sc_secsize;
+	if (dev->si_bsize_phys < vn->sc_secsize)
+		dev->si_bsize_phys = vn->sc_secsize;
+	if (dev->si_bsize_best < vn->sc_secsize)
+		dev->si_bsize_best = vn->sc_secsize;
 	vn->sc_flags |= VNF_INITED;
 	if (flags == FREAD)
 		vn->sc_flags |= VNF_READONLY;