Deleted Added
full compact
kern_physio.c (135617) kern_physio.c (137029)
1/*
2 * Copyright (c) 1994 John S. Dyson
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 4 unchanged lines hidden (view full) ---

13 * documentation and/or other materials provided with the distribution.
14 * 3. Absolutely no warranty of function or purpose is made by the author
15 * John S. Dyson.
16 * 4. Modifications may be freely made to this file if the above conditions
17 * are met.
18 */
19
20#include <sys/cdefs.h>
1/*
2 * Copyright (c) 1994 John S. Dyson
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 4 unchanged lines hidden (view full) ---

13 * documentation and/or other materials provided with the distribution.
14 * 3. Absolutely no warranty of function or purpose is made by the author
15 * John S. Dyson.
16 * 4. Modifications may be freely made to this file if the above conditions
17 * are met.
18 */
19
20#include <sys/cdefs.h>
21__FBSDID("$FreeBSD: head/sys/kern/kern_physio.c 135617 2004-09-23 14:45:04Z phk $");
21__FBSDID("$FreeBSD: head/sys/kern/kern_physio.c 137029 2004-10-29 07:16:37Z phk $");
22
23#include <sys/param.h>
24#include <sys/systm.h>
25#include <sys/bio.h>
26#include <sys/buf.h>
27#include <sys/conf.h>
28#include <sys/proc.h>
29#include <sys/uio.h>

--- 60 unchanged lines hidden (view full) ---

90 bp->b_blkno = btodb(bp->b_offset);
91
92 if (uio->uio_segflg == UIO_USERSPACE)
93 if (vmapbuf(bp) < 0) {
94 error = EFAULT;
95 goto doerror;
96 }
97
22
23#include <sys/param.h>
24#include <sys/systm.h>
25#include <sys/bio.h>
26#include <sys/buf.h>
27#include <sys/conf.h>
28#include <sys/proc.h>
29#include <sys/uio.h>

--- 60 unchanged lines hidden (view full) ---

90 bp->b_blkno = btodb(bp->b_offset);
91
92 if (uio->uio_segflg == UIO_USERSPACE)
93 if (vmapbuf(bp) < 0) {
94 error = EFAULT;
95 goto doerror;
96 }
97
98 dev_strategy(bp);
98 dev_strategy(dev, bp);
99 if (uio->uio_rw == UIO_READ)
100 bwait(bp, PRIBIO, "physrd");
101 else
102 bwait(bp, PRIBIO, "physwr");
103
104 if (uio->uio_segflg == UIO_USERSPACE)
105 vunmapbuf(bp);
106 iolen = bp->b_bcount - bp->b_resid;

--- 18 unchanged lines hidden ---
99 if (uio->uio_rw == UIO_READ)
100 bwait(bp, PRIBIO, "physrd");
101 else
102 bwait(bp, PRIBIO, "physwr");
103
104 if (uio->uio_segflg == UIO_USERSPACE)
105 vunmapbuf(bp);
106 iolen = bp->b_bcount - bp->b_resid;

--- 18 unchanged lines hidden ---