summaryrefslogtreecommitdiffstats
path: root/sys/dev/amr
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-09-20 12:52:03 +0000
committerphk <phk@FreeBSD.org>2002-09-20 12:52:03 +0000
commit1919170e9039df45d87abbe1d7b256cc0db1ed19 (patch)
tree1d367b627ceceea40420446ef7bb5ef0ae17c419 /sys/dev/amr
parentb003f2381fcadb1c640d68a8885d0a806a0e8d9c (diff)
downloadFreeBSD-src-1919170e9039df45d87abbe1d7b256cc0db1ed19.zip
FreeBSD-src-1919170e9039df45d87abbe1d7b256cc0db1ed19.tar.gz
Make FreeBSD "struct disklabel" agnostic, step 311 of 723:
Rename diskerr() to disk_err() for naming consistency. Drop the by now entirely useless struct disklabel argument. Add a flag argument for new-line termination. Fix a couple of printf-format-casts to %j instead of %l. Correctly print the name of all bio commands. Move the function from subr_disklabel.c to subr_disk.c, and from <sys/disklabel.h> to <sys/disk.h>. Use the new disk_err() throughout, #include <sys/disk.h> as needed. Bump __FreeBSD_version for the sake of the aac disk drivers #ifdefs. Remove unused disklabel members of softc for aac, amr and mlx, which seem to originally have been intended for diskerr() use, but which only rotted and got Copy&Pasted at least two times to many. Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'sys/dev/amr')
-rw-r--r--sys/dev/amr/amrvar.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index 4436b3c..ad08b67 100644
--- a/sys/dev/amr/amrvar.h
+++ b/sys/dev/amr/amrvar.h
@@ -223,7 +223,6 @@ struct amrd_softc
struct amr_logdrive *amrd_drive;
struct disk amrd_disk;
struct devstat amrd_stats;
- struct disklabel amrd_label;
int amrd_unit;
int amrd_flags;
#define AMRD_OPEN (1<<0) /* drive is open (can't detach) */
OpenPOWER on IntegriCloud