Author: jh
Date: Fri Jan 18 08:10:00 2013
New Revision: 245590
URL: http://svnweb.freebsd.org/changeset/base/245590
Log:
MFC r243373:
Print correct unit number when attaching preloaded memory disks.
Retire now unused mdunits variable.
Modified:
stable/9/sys/dev/md/md.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/md/md.c
==============================================================================
--- stable/9/sys/dev/md/md.c Fri Jan 18 05:58:02 2013 (r245589)
+++ stable/9/sys/dev/md/md.c Fri Jan 18 08:10:00 2013 (r245590)
@@ -131,7 +131,6 @@ static g_access_t g_md_access;
static void g_md_dumpconf(struct sbuf *sb, const char *indent,
struct g_geom *gp, struct g_consumer *cp __unused, struct g_provider *pp);
-static int mdunits;
static struct cdev *status_dev = 0;
static struct sx md_sx;
static struct unrhdr *md_uh;
@@ -1243,7 +1242,7 @@ mdctlioctl(struct cdev *dev, u_long cmd,
}
static void
-md_preloaded(u_char *image, size_t length)
+md_preloaded(u_char *image, size_t length, const char *name)
{
struct md_s *sc;
int error;
@@ -1261,6 +1260,10 @@ md_preloaded(u_char *image, size_t lengt
rootdevnames[0] = "ufs:/dev/md0";
#endif
mdinit(sc);
+ if (name != NULL) {
+ printf("%s%d: Preloaded image <%s> %zd bytes at %p\n",
+ MD_NAME, sc->unit, name, length, image);
+ }
}
static void
@@ -1281,7 +1284,7 @@ g_md_init(struct g_class *mp __unused)
md_uh = new_unrhdr(0, INT_MAX, NULL);
#ifdef MD_ROOT_SIZE
sx_xlock(&md_sx);
- md_preloaded(mfs_root.start, sizeof(mfs_root.start));
+ md_preloaded(mfs_root.start, sizeof(mfs_root.start), NULL);
sx_xunlock(&md_sx);
#endif
/* XXX: are preload_* static or do they need Giant ? */
@@ -1297,10 +1300,8 @@ g_md_init(struct g_class *mp __unused)
ptr = preload_fetch_addr(mod);
len = preload_fetch_size(mod);
if (ptr != NULL && len != 0) {
- printf("%s%d: Preloaded image <%s> %d bytes at %p\n",
- MD_NAME, mdunits, name, len, ptr);
sx_xlock(&md_sx);
- md_preloaded(ptr, len);
+ md_preloaded(ptr, len, name);
sx_xunlock(&md_sx);
}
}
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
