Module Name: src
Committed By: martin
Date: Sun Feb 26 09:49:40 UTC 2017
Modified Files:
src/sys/dev/sun: disksubr.c
Log Message:
Disks without a disk label happen in normal operation (both as USB
stick or with GPT), so do not cause an error message when opening
them.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/sun/disksubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sun/disksubr.c
diff -u src/sys/dev/sun/disksubr.c:1.14 src/sys/dev/sun/disksubr.c:1.15
--- src/sys/dev/sun/disksubr.c:1.14 Tue Mar 23 20:01:09 2010
+++ src/sys/dev/sun/disksubr.c Sun Feb 26 09:49:40 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.14 2010/03/23 20:01:09 martin Exp $ */
+/* $NetBSD: disksubr.c,v 1.15 2017/02/26 09:49:40 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.14 2010/03/23 20:01:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.15 2017/02/26 09:49:40 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,7 +160,7 @@ readdisklabel(dev_t dev, void (*strat)(s
}
memset(clp->cd_block, 0, sizeof(clp->cd_block));
- return ("no disk label");
+ return NULL;
}
/*
