Commit 5b29b6c5 authored by James Bottomley's avatar James Bottomley

Merge mulgrave.(none):/home/jejb/BK/scsi-sg-sleep-fix-2.5

into mulgrave.(none):/home/jejb/BK/scsi-for-linus-2.5
parents 01155446 6c5808ec
...@@ -1354,32 +1354,42 @@ sg_init() ...@@ -1354,32 +1354,42 @@ sg_init()
{ {
static int sg_registered = 0; static int sg_registered = 0;
unsigned long iflags; unsigned long iflags;
int tmp_dev_max;
Sg_device **tmp_da;
if ((sg_template.dev_noticed == 0) || sg_dev_arr) if ((sg_template.dev_noticed == 0) || sg_dev_arr)
return 0; return 0;
SCSI_LOG_TIMEOUT(3, printk("sg_init\n"));
write_lock_irqsave(&sg_dev_arr_lock, iflags);
tmp_dev_max = sg_template.dev_noticed + SG_DEV_ARR_LUMP;
write_unlock_irqrestore(&sg_dev_arr_lock, iflags);
tmp_da = (Sg_device **)vmalloc(
tmp_dev_max * sizeof(Sg_device *));
if (NULL == tmp_da) {
printk(KERN_ERR "sg_init: no space for sg_dev_arr\n");
return 1;
}
write_lock_irqsave(&sg_dev_arr_lock, iflags); write_lock_irqsave(&sg_dev_arr_lock, iflags);
if (!sg_registered) { if (!sg_registered) {
if (register_chrdev(SCSI_GENERIC_MAJOR, "sg", &sg_fops)) { if (register_chrdev(SCSI_GENERIC_MAJOR, "sg", &sg_fops)) {
printk(KERN_ERR printk(KERN_ERR
"Unable to get major %d for generic SCSI device\n", "Unable to get major %d for generic SCSI device\n",
SCSI_GENERIC_MAJOR); SCSI_GENERIC_MAJOR);
write_unlock_irqrestore(&sg_dev_arr_lock, iflags); write_unlock_irqrestore(&sg_dev_arr_lock, iflags);
vfree((char *) tmp_da);
return 1; return 1;
} }
sg_registered++; sg_registered++;
} }
SCSI_LOG_TIMEOUT(3, printk("sg_init\n")); memset(tmp_da, 0, tmp_dev_max * sizeof (Sg_device *));
sg_template.dev_max = sg_template.dev_noticed + SG_DEV_ARR_LUMP; sg_template.dev_max = tmp_dev_max;
sg_dev_arr = (Sg_device **)vmalloc( sg_dev_arr = tmp_da;
sg_template.dev_max * sizeof(Sg_device *));
if (NULL == sg_dev_arr) {
printk(KERN_ERR "sg_init: no space for sg_dev_arr\n");
write_unlock_irqrestore(&sg_dev_arr_lock, iflags);
return 1;
}
memset(sg_dev_arr, 0, sg_template.dev_max * sizeof (Sg_device *));
write_unlock_irqrestore(&sg_dev_arr_lock, iflags); write_unlock_irqrestore(&sg_dev_arr_lock, iflags);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
sg_proc_init(); sg_proc_init();
...@@ -1430,7 +1440,7 @@ static DEVICE_ATTR(type,S_IRUGO,sg_device_type_read,NULL); ...@@ -1430,7 +1440,7 @@ static DEVICE_ATTR(type,S_IRUGO,sg_device_type_read,NULL);
static int static int
sg_attach(Scsi_Device * scsidp) sg_attach(Scsi_Device * scsidp)
{ {
Sg_device *sdp; Sg_device *sdp = NULL;
unsigned long iflags; unsigned long iflags;
int k; int k;
...@@ -1439,15 +1449,16 @@ sg_attach(Scsi_Device * scsidp) ...@@ -1439,15 +1449,16 @@ sg_attach(Scsi_Device * scsidp)
Sg_device **tmp_da; Sg_device **tmp_da;
int tmp_dev_max = sg_template.nr_dev + SG_DEV_ARR_LUMP; int tmp_dev_max = sg_template.nr_dev + SG_DEV_ARR_LUMP;
write_unlock_irqrestore(&sg_dev_arr_lock, iflags);
tmp_da = (Sg_device **)vmalloc( tmp_da = (Sg_device **)vmalloc(
tmp_dev_max * sizeof(Sg_device *)); tmp_dev_max * sizeof(Sg_device *));
if (NULL == tmp_da) { if (NULL == tmp_da) {
scsidp->attached--; scsidp->attached--;
write_unlock_irqrestore(&sg_dev_arr_lock, iflags);
printk(KERN_ERR printk(KERN_ERR
"sg_attach: device array cannot be resized\n"); "sg_attach: device array cannot be resized\n");
return 1; return 1;
} }
write_lock_irqsave(&sg_dev_arr_lock, iflags);
memset(tmp_da, 0, tmp_dev_max * sizeof (Sg_device *)); memset(tmp_da, 0, tmp_dev_max * sizeof (Sg_device *));
memcpy(tmp_da, sg_dev_arr, memcpy(tmp_da, sg_dev_arr,
sg_template.dev_max * sizeof (Sg_device *)); sg_template.dev_max * sizeof (Sg_device *));
...@@ -1456,6 +1467,7 @@ sg_attach(Scsi_Device * scsidp) ...@@ -1456,6 +1467,7 @@ sg_attach(Scsi_Device * scsidp)
sg_template.dev_max = tmp_dev_max; sg_template.dev_max = tmp_dev_max;
} }
find_empty_slot:
for (k = 0; k < sg_template.dev_max; k++) for (k = 0; k < sg_template.dev_max; k++)
if (!sg_dev_arr[k]) if (!sg_dev_arr[k])
break; break;
...@@ -1467,11 +1479,19 @@ sg_attach(Scsi_Device * scsidp) ...@@ -1467,11 +1479,19 @@ sg_attach(Scsi_Device * scsidp)
" type=%d, minor number exceed %d\n", " type=%d, minor number exceed %d\n",
scsidp->host->host_no, scsidp->channel, scsidp->id, scsidp->host->host_no, scsidp->channel, scsidp->id,
scsidp->lun, scsidp->type, SG_MAX_DEVS_MASK); scsidp->lun, scsidp->type, SG_MAX_DEVS_MASK);
if (NULL != sdp)
vfree((char *) sdp);
return 1; return 1;
} }
if (k < sg_template.dev_max) if (k < sg_template.dev_max) {
if (NULL == sdp) {
write_unlock_irqrestore(&sg_dev_arr_lock, iflags);
sdp = (Sg_device *)vmalloc(sizeof(Sg_device)); sdp = (Sg_device *)vmalloc(sizeof(Sg_device));
else write_lock_irqsave(&sg_dev_arr_lock, iflags);
if (!sg_dev_arr[k])
goto find_empty_slot;
}
} else
sdp = NULL; sdp = NULL;
if (NULL == sdp) { if (NULL == sdp) {
scsidp->attached--; scsidp->attached--;
...@@ -1498,17 +1518,18 @@ sg_attach(Scsi_Device * scsidp) ...@@ -1498,17 +1518,18 @@ sg_attach(Scsi_Device * scsidp)
scsidp->sdev_driverfs_dev.name); scsidp->sdev_driverfs_dev.name);
sdp->sg_driverfs_dev.parent = &scsidp->sdev_driverfs_dev; sdp->sg_driverfs_dev.parent = &scsidp->sdev_driverfs_dev;
sdp->sg_driverfs_dev.bus = &scsi_driverfs_bus_type; sdp->sg_driverfs_dev.bus = &scsi_driverfs_bus_type;
sg_template.nr_dev++;
sg_dev_arr[k] = sdp;
write_unlock_irqrestore(&sg_dev_arr_lock, iflags);
device_register(&sdp->sg_driverfs_dev); device_register(&sdp->sg_driverfs_dev);
device_create_file(&sdp->sg_driverfs_dev, &dev_attr_type); device_create_file(&sdp->sg_driverfs_dev, &dev_attr_type);
device_create_file(&sdp->sg_driverfs_dev, &dev_attr_kdev); device_create_file(&sdp->sg_driverfs_dev, &dev_attr_kdev);
sdp->de = devfs_register(scsidp->de, "generic", DEVFS_FL_DEFAULT, sdp->de = devfs_register(scsidp->de, "generic", DEVFS_FL_DEFAULT,
SCSI_GENERIC_MAJOR, k, SCSI_GENERIC_MAJOR, k,
S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP, S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP,
&sg_fops, sdp); &sg_fops, sdp);
sg_template.nr_dev++;
sg_dev_arr[k] = sdp;
write_unlock_irqrestore(&sg_dev_arr_lock, iflags);
switch (scsidp->type) { switch (scsidp->type) {
case TYPE_DISK: case TYPE_DISK:
case TYPE_MOD: case TYPE_MOD:
...@@ -1529,7 +1550,7 @@ sg_attach(Scsi_Device * scsidp) ...@@ -1529,7 +1550,7 @@ sg_attach(Scsi_Device * scsidp)
static void static void
sg_detach(Scsi_Device * scsidp) sg_detach(Scsi_Device * scsidp)
{ {
Sg_device *sdp; Sg_device *sdp = NULL;
unsigned long iflags; unsigned long iflags;
Sg_fd *sfp; Sg_fd *sfp;
Sg_fd *tsfp; Sg_fd *tsfp;
...@@ -1571,22 +1592,11 @@ sg_detach(Scsi_Device * scsidp) ...@@ -1571,22 +1592,11 @@ sg_detach(Scsi_Device * scsidp)
} }
} }
SCSI_LOG_TIMEOUT(3, printk("sg_detach: dev=%d, dirty\n", k)); SCSI_LOG_TIMEOUT(3, printk("sg_detach: dev=%d, dirty\n", k));
devfs_unregister(sdp->de);
device_remove_file(&sdp->sg_driverfs_dev,
&dev_attr_type);
device_remove_file(&sdp->sg_driverfs_dev,
&dev_attr_kdev);
put_device(&sdp->sg_driverfs_dev);
sdp->de = NULL;
if (NULL == sdp->headfp) { if (NULL == sdp->headfp) {
vfree((char *) sdp);
sg_dev_arr[k] = NULL; sg_dev_arr[k] = NULL;
} }
} else { /* nothing active, simple case */ } else { /* nothing active, simple case */
SCSI_LOG_TIMEOUT(3, printk("sg_detach: dev=%d\n", k)); SCSI_LOG_TIMEOUT(3, printk("sg_detach: dev=%d\n", k));
devfs_unregister(sdp->de);
put_device(&sdp->sg_driverfs_dev);
vfree((char *) sdp);
sg_dev_arr[k] = NULL; sg_dev_arr[k] = NULL;
} }
scsidp->attached--; scsidp->attached--;
...@@ -1595,6 +1605,17 @@ sg_detach(Scsi_Device * scsidp) ...@@ -1595,6 +1605,17 @@ sg_detach(Scsi_Device * scsidp)
break; break;
} }
write_unlock_irqrestore(&sg_dev_arr_lock, iflags); write_unlock_irqrestore(&sg_dev_arr_lock, iflags);
if (sdp) {
devfs_unregister(sdp->de);
sdp->de = NULL;
device_remove_file(&sdp->sg_driverfs_dev, &dev_attr_type);
device_remove_file(&sdp->sg_driverfs_dev, &dev_attr_kdev);
put_device(&sdp->sg_driverfs_dev);
if (NULL == sdp->headfp)
vfree((char *) sdp);
}
if (delay) if (delay)
scsi_sleep(2); /* dirty detach so delay device destruction */ scsi_sleep(2); /* dirty detach so delay device destruction */
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment