svn commit: r212259 - in projects/sv/sys: amd64/amd64 arm/arm geom
i386/i386 ia64/ia64 net powerpc/powerpc sparc64/sparc64
sun4v/sun4v sys
Attilio Rao
attilio at FreeBSD.org
Mon Sep 6 16:33:46 UTC 2010
Author: attilio
Date: Mon Sep 6 16:33:46 2010
New Revision: 212259
URL: http://svn.freebsd.org/changeset/base/212259
Log:
Rever r212142.
Discussed with: emaste, rstone
Modified:
projects/sv/sys/amd64/amd64/dump_machdep.c
projects/sv/sys/amd64/amd64/minidump_machdep.c
projects/sv/sys/arm/arm/dump_machdep.c
projects/sv/sys/arm/arm/minidump_machdep.c
projects/sv/sys/geom/geom_disk.c
projects/sv/sys/i386/i386/dump_machdep.c
projects/sv/sys/i386/i386/minidump_machdep.c
projects/sv/sys/ia64/ia64/dump_machdep.c
projects/sv/sys/net/netdump_client.c
projects/sv/sys/powerpc/powerpc/dump_machdep.c
projects/sv/sys/sparc64/sparc64/dump_machdep.c
projects/sv/sys/sun4v/sun4v/dump_machdep.c
projects/sv/sys/sys/conf.h
Modified: projects/sv/sys/amd64/amd64/dump_machdep.c
==============================================================================
--- projects/sv/sys/amd64/amd64/dump_machdep.c Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/amd64/amd64/dump_machdep.c Mon Sep 6 16:33:46 2010 (r212259)
@@ -297,17 +297,12 @@ dumpsys(struct dumperinfo *di)
hdrgap = fileofs - DEV_ALIGN(hdrsz);
/* Determine dump offset on device. */
- if ((di->flags & DIF_NET) != 0)
- dumplo = 0;
- else {
- if (di->mediasize <
- SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
- error = ENOSPC;
- goto fail;
- }
- dumplo = di->mediaoffset + di->mediasize - dumpsize;
- dumplo -= sizeof(kdh) * 2;
+ if (di->mediasize < SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
+ error = ENOSPC;
+ goto fail;
}
+ dumplo = di->mediaoffset + di->mediasize - dumpsize;
+ dumplo -= sizeof(kdh) * 2;
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, di->blocksize);
Modified: projects/sv/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- projects/sv/sys/amd64/amd64/minidump_machdep.c Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/amd64/amd64/minidump_machdep.c Mon Sep 6 16:33:46 2010 (r212259)
@@ -243,17 +243,12 @@ minidumpsys(struct dumperinfo *di)
dumpsize += PAGE_SIZE;
/* Determine dump offset on device. */
- if ((di->flags & DIF_NET) != 0)
- dumplo = 0;
- else {
- if (di->mediasize <
- SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
- error = ENOSPC;
- goto fail;
- }
- dumplo = di->mediaoffset + di->mediasize - dumpsize;
- dumplo -= sizeof(kdh) * 2;
+ if (di->mediasize < SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
+ error = ENOSPC;
+ goto fail;
}
+ dumplo = di->mediaoffset + di->mediasize - dumpsize;
+ dumplo -= sizeof(kdh) * 2;
progress = dumpsize;
/* Initialize mdhdr */
Modified: projects/sv/sys/arm/arm/dump_machdep.c
==============================================================================
--- projects/sv/sys/arm/arm/dump_machdep.c Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/arm/arm/dump_machdep.c Mon Sep 6 16:33:46 2010 (r212259)
@@ -304,17 +304,12 @@ dumpsys(struct dumperinfo *di)
hdrgap = fileofs - DEV_ALIGN(hdrsz);
/* Determine dump offset on device. */
- if ((di->flags & DIF_NET) != 0)
- dumplo = 0;
- else {
- if (di->mediasize <
- SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
- error = ENOSPC;
- goto fail;
- }
- dumplo = di->mediaoffset + di->mediasize - dumpsize;
- dumplo -= sizeof(kdh) * 2;
+ if (di->mediasize < SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
+ error = ENOSPC;
+ goto fail;
}
+ dumplo = di->mediaoffset + di->mediasize - dumpsize;
+ dumplo -= sizeof(kdh) * 2;
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION, dumpsize, di->blocksize);
Modified: projects/sv/sys/arm/arm/minidump_machdep.c
==============================================================================
--- projects/sv/sys/arm/arm/minidump_machdep.c Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/arm/arm/minidump_machdep.c Mon Sep 6 16:33:46 2010 (r212259)
@@ -277,18 +277,13 @@ minidumpsys(struct dumperinfo *di)
dumpsize += PAGE_SIZE;
/* Determine dump offset on device. */
- if ((di->flags & DIF_NET) != 0)
- dumplo = 0;
- else {
- if (di->mediasize <
- SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
- error = ENOSPC;
- goto fail;
- }
-
- dumplo = di->mediaoffset + di->mediasize - dumpsize;
- dumplo -= sizeof(kdh) * 2;
+ if (di->mediasize < SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
+ error = ENOSPC;
+ goto fail;
}
+
+ dumplo = di->mediaoffset + di->mediasize - dumpsize;
+ dumplo -= sizeof(kdh) * 2;
progress = dumpsize;
/* Initialize mdhdr */
Modified: projects/sv/sys/geom/geom_disk.c
==============================================================================
--- projects/sv/sys/geom/geom_disk.c Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/geom/geom_disk.c Mon Sep 6 16:33:46 2010 (r212259)
@@ -182,7 +182,6 @@ g_disk_kerneldump(struct bio *bp, struct
di.blocksize = dp->d_sectorsize;
di.maxiosize = dp->d_maxsize;
di.mediaoffset = gkd->offset;
- di.flags = 0;
if ((gkd->offset + gkd->length) > dp->d_mediasize)
gkd->length = dp->d_mediasize - gkd->offset;
di.mediasize = gkd->length;
Modified: projects/sv/sys/i386/i386/dump_machdep.c
==============================================================================
--- projects/sv/sys/i386/i386/dump_machdep.c Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/i386/i386/dump_machdep.c Mon Sep 6 16:33:46 2010 (r212259)
@@ -297,17 +297,12 @@ dumpsys(struct dumperinfo *di)
hdrgap = fileofs - DEV_ALIGN(hdrsz);
/* Determine dump offset on device. */
- if ((di->flags & DIF_NET) != 0)
- dumplo = 0;
- else {
- if (di->mediasize <
- SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
- error = ENOSPC;
- goto fail;
- }
- dumplo = di->mediaoffset + di->mediasize - dumpsize;
- dumplo -= sizeof(kdh) * 2;
+ if (di->mediasize < SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
+ error = ENOSPC;
+ goto fail;
}
+ dumplo = di->mediaoffset + di->mediasize - dumpsize;
+ dumplo -= sizeof(kdh) * 2;
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_I386_VERSION, dumpsize, di->blocksize);
Modified: projects/sv/sys/i386/i386/minidump_machdep.c
==============================================================================
--- projects/sv/sys/i386/i386/minidump_machdep.c Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/i386/i386/minidump_machdep.c Mon Sep 6 16:33:46 2010 (r212259)
@@ -243,17 +243,12 @@ minidumpsys(struct dumperinfo *di)
dumpsize += PAGE_SIZE;
/* Determine dump offset on device. */
- if ((di->flags & DIF_NET) != 0)
- dumplo = 0;
- else {
- if (di->mediasize <
- SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
- error = ENOSPC;
- goto fail;
- }
- dumplo = di->mediaoffset + di->mediasize - dumpsize;
- dumplo -= sizeof(kdh) * 2;
+ if (di->mediasize < SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
+ error = ENOSPC;
+ goto fail;
}
+ dumplo = di->mediaoffset + di->mediasize - dumpsize;
+ dumplo -= sizeof(kdh) * 2;
progress = dumpsize;
/* Initialize mdhdr */
Modified: projects/sv/sys/ia64/ia64/dump_machdep.c
==============================================================================
--- projects/sv/sys/ia64/ia64/dump_machdep.c Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/ia64/ia64/dump_machdep.c Mon Sep 6 16:33:46 2010 (r212259)
@@ -232,17 +232,12 @@ dumpsys(struct dumperinfo *di)
hdrgap = fileofs - DEV_ALIGN(hdrsz);
/* Determine dump offset on device. */
- if ((di->flags & DIF_NET) != 0)
- dumplo = 0;
- else {
- if (di->mediasize <
- SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
- error = ENOSPC;
- goto fail;
- }
- dumplo = di->mediaoffset + di->mediasize - dumpsize;
- dumplo -= sizeof(kdh) * 2;
+ if (di->mediasize < SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
+ error = ENOSPC;
+ goto fail;
}
+ dumplo = di->mediaoffset + di->mediasize - dumpsize;
+ dumplo -= sizeof(kdh) * 2;
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_IA64_VERSION, dumpsize, di->blocksize);
Modified: projects/sv/sys/net/netdump_client.c
==============================================================================
--- projects/sv/sys/net/netdump_client.c Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/net/netdump_client.c Mon Sep 6 16:33:46 2010 (r212259)
@@ -1222,7 +1222,7 @@ netdump_trigger(void *arg, int howto)
dumper.dumper = netdump_dumper;
dumper.priv = NULL;
dumper.blocksize = NETDUMP_DATASIZE;
- dumper.flags = DIF_NET;
+ dumper.flags = DF_NET;
/* in dump_machdep.c */
dumpsys(&dumper);
Modified: projects/sv/sys/powerpc/powerpc/dump_machdep.c
==============================================================================
--- projects/sv/sys/powerpc/powerpc/dump_machdep.c Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/powerpc/powerpc/dump_machdep.c Mon Sep 6 16:33:46 2010 (r212259)
@@ -233,8 +233,8 @@ dumpsys(struct dumperinfo *di)
dumpsize += fileofs;
hdrgap = fileofs - DEV_ALIGN(hdrsz);
- /* Determine dump offset on device. */
- if ((di->flags & DIF_NET) == 0 && di->mediasize > 0) {
+ /* For block devices, determine the dump offset on the device. */
+ if (di->mediasize > 0) {
if (di->mediasize <
SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
error = ENOSPC;
Modified: projects/sv/sys/sparc64/sparc64/dump_machdep.c
==============================================================================
--- projects/sv/sys/sparc64/sparc64/dump_machdep.c Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/sparc64/sparc64/dump_machdep.c Mon Sep 6 16:33:46 2010 (r212259)
@@ -167,8 +167,7 @@ dumpsys(struct dumperinfo *di)
}
/* Determine dump offset on device. */
- dumplo = (di->flags & DIF_NET) != 0 ? 0 :
- di->mediaoffset + di->mediasize - totsize;
+ dumplo = di->mediaoffset + di->mediasize - totsize;
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_SPARC64_VERSION, size, di->blocksize);
Modified: projects/sv/sys/sun4v/sun4v/dump_machdep.c
==============================================================================
--- projects/sv/sys/sun4v/sun4v/dump_machdep.c Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/sun4v/sun4v/dump_machdep.c Mon Sep 6 16:33:46 2010 (r212259)
@@ -170,8 +170,7 @@ dumpsys(struct dumperinfo *di)
}
/* Determine dump offset on device. */
- dumplo = (di->flags & DIF_NET) != 0 ? 0 :
- di->mediaoffset + di->mediasize - totsize;
+ dumplo = di->mediaoffset + di->mediasize - totsize;
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_SPARC64_VERSION, size, di->blocksize);
Modified: projects/sv/sys/sys/conf.h
==============================================================================
--- projects/sv/sys/sys/conf.h Mon Sep 6 15:48:06 2010 (r212258)
+++ projects/sv/sys/sys/conf.h Mon Sep 6 16:33:46 2010 (r212259)
@@ -317,8 +317,6 @@ EVENTHANDLER_DECLARE(dev_clone, dev_clon
/* Stuff relating to kernel-dump */
-#define DIF_NET 0x01 /* Dump over network. */
-
struct dumperinfo {
dumper_t *dumper; /* Dumping function. */
void *priv; /* Private parts. */
@@ -326,7 +324,6 @@ struct dumperinfo {
u_int maxiosize; /* Max size allowed for an individual I/O */
off_t mediaoffset; /* Initial offset in bytes. */
off_t mediasize; /* Space available in bytes. */
- u_int flags; /* Dump device flags. */
};
int set_dumper(struct dumperinfo *);
More information about the svn-src-projects
mailing list