Deleted Added
full compact
subr_disk.c (210225) subr_disk.c (210226)
1/*-
2 * ----------------------------------------------------------------------------
3 * "THE BEER-WARE LICENSE" (Revision 42):
4 * <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you
5 * can do whatever you want with this stuff. If we meet some day, and you think
6 * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
7 * ----------------------------------------------------------------------------
8 *
9 * The bioq_disksort() (and the specification of the bioq API)
10 * have been written by Luigi Rizzo and Fabio Checconi under the same
11 * license as above.
12 */
13
14#include <sys/cdefs.h>
1/*-
2 * ----------------------------------------------------------------------------
3 * "THE BEER-WARE LICENSE" (Revision 42):
4 * <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you
5 * can do whatever you want with this stuff. If we meet some day, and you think
6 * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
7 * ----------------------------------------------------------------------------
8 *
9 * The bioq_disksort() (and the specification of the bioq API)
10 * have been written by Luigi Rizzo and Fabio Checconi under the same
11 * license as above.
12 */
13
14#include <sys/cdefs.h>
15__FBSDID("$FreeBSD: head/sys/kern/subr_disk.c 210225 2010-07-18 20:23:10Z trasz $");
15__FBSDID("$FreeBSD: head/sys/kern/subr_disk.c 210226 2010-07-18 20:57:53Z trasz $");
16
17#include "opt_geom.h"
18
19#include <sys/param.h>
20#include <sys/systm.h>
21#include <sys/bio.h>
22#include <sys/conf.h>
23#include <sys/disk.h>
24#include <geom/geom_disk.h>
25
16
17#include "opt_geom.h"
18
19#include <sys/param.h>
20#include <sys/systm.h>
21#include <sys/bio.h>
22#include <sys/conf.h>
23#include <sys/disk.h>
24#include <geom/geom_disk.h>
25
26/*
26/*-
27 * Disk error is the preface to plaintive error messages
28 * about failing disk transfers. It prints messages of the form
29 * "hp0g: BLABLABLA cmd=read fsbn 12345 of 12344-12347"
30 * blkdone should be -1 if the position of the error is unknown.
31 * The message is printed with printf.
32 */
33void
34disk_err(struct bio *bp, const char *what, int blkdone, int nl)

--- 216 unchanged lines hidden ---
27 * Disk error is the preface to plaintive error messages
28 * about failing disk transfers. It prints messages of the form
29 * "hp0g: BLABLABLA cmd=read fsbn 12345 of 12344-12347"
30 * blkdone should be -1 if the position of the error is unknown.
31 * The message is printed with printf.
32 */
33void
34disk_err(struct bio *bp, const char *what, int blkdone, int nl)

--- 216 unchanged lines hidden ---