Page MenuHomeFreeBSD
Files F143818048

D14962.diff
No OneTemporary
Actions

D14962.diff
View Options

Index: head/sys/geom/geom_subr.c
===================================================================
--- head/sys/geom/geom_subr.c
+++ head/sys/geom/geom_subr.c
@@ -1050,16 +1050,16 @@
bzero(bp->bio_data, bp->bio_length);
if (strlcpy(bp->bio_data, val, bp->bio_length) >=
bp->bio_length) {
- printf("%s: %s bio_length %jd len %zu -> EFAULT\n",
- __func__, bp->bio_to->name,
+ printf("%s: %s %s bio_length %jd strlen %zu -> EFAULT\n",
+ __func__, bp->bio_to->name, attribute,
(intmax_t)bp->bio_length, strlen(val));
error = EFAULT;
}
} else if (bp->bio_length == len) {
bcopy(val, bp->bio_data, len);
} else {
- printf("%s: %s bio_length %jd len %d -> EFAULT\n", __func__,
- bp->bio_to->name, (intmax_t)bp->bio_length, len);
+ printf("%s: %s %s bio_length %jd len %d -> EFAULT\n", __func__,
+ bp->bio_to->name, attribute, (intmax_t)bp->bio_length, len);
error = EFAULT;
}
if (error == 0)
Index: head/sys/geom/label/g_label_disk_ident.c
===================================================================
--- head/sys/geom/label/g_label_disk_ident.c
+++ head/sys/geom/label/g_label_disk_ident.c
@@ -49,7 +49,7 @@
g_label_disk_ident_taste(struct g_consumer *cp, char *label, size_t size)
{
struct g_class *cls;
- char ident[100];
+ char ident[DISK_IDENT_SIZE];
int ident_len, found, i;
g_topology_assert_not();
Index: head/sys/geom/raid/md_ddf.c
===================================================================
--- head/sys/geom/raid/md_ddf.c
+++ head/sys/geom/raid/md_ddf.c
@@ -41,6 +41,7 @@
#include <sys/systm.h>
#include <sys/time.h>
#include <sys/clock.h>
+#include <sys/disk.h>
#include <geom/geom.h>
#include "geom/raid/g_raid.h"
#include "geom/raid/md_ddf.h"
@@ -572,7 +573,7 @@
off_t anchorlba;
u_int ss, pos, size;
int len, error;
- char serial_buffer[24];
+ char serial_buffer[DISK_IDENT_SIZE];
if (sample->hdr == NULL)
sample = NULL;
Index: head/sys/geom/raid/md_intel.c
===================================================================
--- head/sys/geom/raid/md_intel.c
+++ head/sys/geom/raid/md_intel.c
@@ -41,6 +41,7 @@
#include <sys/mutex.h>
#include <sys/systm.h>
#include <sys/taskqueue.h>
+#include <sys/disk.h>
#include <geom/geom.h>
#include "geom/raid/g_raid.h"
#include "g_raid_md_if.h"
@@ -1450,7 +1451,7 @@
static int
g_raid_md_get_label(struct g_consumer *cp, char *serial, int serlen)
{
- char serial_buffer[24];
+ char serial_buffer[DISK_IDENT_SIZE];
int len, error;
len = sizeof(serial_buffer);

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 1, 3:25 PM (20 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28399684
Default Alt Text
D14962.diff (2 KB)

Event Timeline