diff options
| author | Alex Wilson <alex@cooperi.net> | 2015-04-07 18:09:51 +1000 |
|---|---|---|
| committer | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-07-21 18:45:34 +0000 |
| commit | 6a1084147a2c54ddb0dbc4918b5405bb861fff8f (patch) | |
| tree | 9fa7cf3c33d23552ae2ca47326856610577fae05 | |
| parent | f3759e7dcd7928cd30f27fbaf234cbd59d996aef (diff) | |
| download | illumos-joyent-6a1084147a2c54ddb0dbc4918b5405bb861fff8f.tar.gz | |
OS-4510 lxbrand bash dumps core in s2l_devt
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
| -rw-r--r-- | usr/src/lib/brand/lx/lx_brand/common/stat.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/lib/brand/lx/lx_brand/common/stat.c b/usr/src/lib/brand/lx/lx_brand/common/stat.c index 7c2b5008f6..5bc0d822dc 100644 --- a/usr/src/lib/brand/lx/lx_brand/common/stat.c +++ b/usr/src/lib/brand/lx/lx_brand/common/stat.c @@ -21,7 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * Copyright 2014 Joyent, Inc. All rights reserved. + * Copyright 2015 Joyent, Inc. */ /* @@ -162,7 +162,7 @@ lx_stat_init() } else { /* make sure the major node matches */ assert(getmajor(st.st_rdev) == major); - assert(mt[j].mt_minor < LX_MINORMASK); + assert(mt[j].mt_lx_minor < LX_MINORMASK); } /* save the minor node value */ @@ -277,7 +277,8 @@ s2l_devt(dev_t dev, lx_dev_t *jdev, int fd) mt = devt_translators[i].dt_list; for (j = 0; mt[j].mt_path != NULL; j++) { if (mt[j].mt_minor == min) { - assert(mt[j].mt_minor < LX_MINORMASK); + assert( + mt[j].mt_lx_minor < LX_MINORMASK); /* found a translation */ *jdev = LX_MAKEDEVICE( |