summaryrefslogtreecommitdiff
path: root/sys/kern/kern_physio.c
diff options
context:
space:
mode:
authorKenneth D. Merry <ken@FreeBSD.org>2013-08-29 16:41:40 +0000
committerKenneth D. Merry <ken@FreeBSD.org>2013-08-29 16:41:40 +0000
commit880e57b63559b8f01e17d13e050c5a5a493677b9 (patch)
tree31bb42793dc673afbbe3fd9f507fda7deddee968 /sys/kern/kern_physio.c
parent4fc499753563c782036f76e5a2293ffa12477444 (diff)
downloadsrc-test2-880e57b63559b8f01e17d13e050c5a5a493677b9.tar.gz
src-test2-880e57b63559b8f01e17d13e050c5a5a493677b9.zip
Notes
Diffstat (limited to 'sys/kern/kern_physio.c')
-rw-r--r--sys/kern/kern_physio.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index 4e818fc4a64e..b37b9f3074c8 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -58,25 +58,22 @@ physio(struct cdev *dev, struct uio *uio, int ioflag)
* If the driver does not want I/O to be split, that means that we
* need to reject any requests that will not fit into one buffer.
*/
- if ((dev->si_flags & SI_NOSPLIT) &&
- ((uio->uio_resid > dev->si_iosize_max) ||
- (uio->uio_resid > MAXPHYS) ||
- (uio->uio_iovcnt > 1))) {
+ if (dev->si_flags & SI_NOSPLIT &&
+ (uio->uio_resid > dev->si_iosize_max || uio->uio_resid > MAXPHYS ||
+ uio->uio_iovcnt > 1)) {
/*
* Tell the user why his I/O was rejected.
*/
if (uio->uio_resid > dev->si_iosize_max)
- printf("%s: request size %zd > si_iosize_max=%d, "
+ uprintf("%s: request size=%zd > si_iosize_max=%d; "
"cannot split request\n", devtoname(dev),
uio->uio_resid, dev->si_iosize_max);
-
if (uio->uio_resid > MAXPHYS)
- printf("%s: request size %zd > MAXPHYS=%d, "
+ uprintf("%s: request size=%zd > MAXPHYS=%d; "
"cannot split request\n", devtoname(dev),
uio->uio_resid, MAXPHYS);
-
if (uio->uio_iovcnt > 1)
- printf("%s: request vectors=%d > 1, "
+ uprintf("%s: request vectors=%d > 1; "
"cannot split request\n", devtoname(dev),
uio->uio_iovcnt);
@@ -117,8 +114,8 @@ physio(struct cdev *dev, struct uio *uio, int ioflag)
* This device does not want I/O to be split.
*/
if (dev->si_flags & SI_NOSPLIT) {
- printf("%s: request ptr %p is not "
- "on a page boundary, cannot split "
+ uprintf("%s: request ptr %p is not "
+ "on a page boundary; cannot split "
"request\n", devtoname(dev),
bp->b_data);
error = EFBIG;