summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorgz161490 <none@none>2005-08-26 13:38:07 -0700
committergz161490 <none@none>2005-08-26 13:38:07 -0700
commit3d6ab94a897e71e76f611e6d4cd11a4f6b917b98 (patch)
treed5d3b201558581cb7158ebaa4e2110ff6dd352cc /usr/src
parentf551bb10a260c9a42e40d2aa7db079b203ad8511 (diff)
downloadillumos-joyent-3d6ab94a897e71e76f611e6d4cd11a4f6b917b98.tar.gz
6209785 sdopen needs to check if SDPART too large for fields holding bit-per-partition information
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/io/scsi/targets/sd.c2
-rw-r--r--usr/src/uts/common/sys/scsi/targets/sddef.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/common/io/scsi/targets/sd.c b/usr/src/uts/common/io/scsi/targets/sd.c
index fcb8263890..69e0802228 100644
--- a/usr/src/uts/common/io/scsi/targets/sd.c
+++ b/usr/src/uts/common/io/scsi/targets/sd.c
@@ -9947,7 +9947,7 @@ sdopen(dev_t *dev_p, int flag, int otyp, cred_t *cred_p)
struct sd_lun *un;
int nodelay;
int part;
- int partmask;
+ uint64_t partmask;
int instance;
dev_t dev;
int rval = EIO;
diff --git a/usr/src/uts/common/sys/scsi/targets/sddef.h b/usr/src/uts/common/sys/scsi/targets/sddef.h
index 1a71287e47..59582746ef 100644
--- a/usr/src/uts/common/sys/scsi/targets/sddef.h
+++ b/usr/src/uts/common/sys/scsi/targets/sddef.h
@@ -127,8 +127,8 @@ struct ocinfo {
* Types BLK, MNT, CHR, SWP,
* assumed to be types 0-3.
*/
- uint_t lyr_open[NSDMAP];
- uint_t reg_open[OTYPCNT - 1];
+ uint64_t lyr_open[NSDMAP];
+ uint64_t reg_open[OTYPCNT - 1];
};
#define OCSIZE sizeof (struct ocinfo)
@@ -366,7 +366,7 @@ struct sd_lun {
struct dk_geom un_g; /* disk geometry */
struct kstat *un_stats; /* disk statistics */
kstat_t *un_errstats; /* for error statistics */
- uint_t un_exclopen; /* exclusive open bitmask */
+ uint64_t un_exclopen; /* exclusive open bitmask */
ddi_devid_t un_devid; /* device id */
uint_t un_vpd_page_mask; /* Supported VPD pages */
uchar_t un_asciilabel[LEN_DKL_ASCII]; /* Disk ASCII label */