I2O: more error checking
PATCH 1/1 I2O: more error checking
i2o_scsi: handle sysfs failure
i2o_device:
* convert i2o_device_add() to return integer error code rather than pointer. Fortunately -nobody- checks the return code of this function, so changing has nil impact.
* handle errors thrown by device_register()
More work in i2o_device remains.
---
drivers/message/i2o/device.c | 16 +++++++++++----- drivers/message/i2o/i2o_scsi.c | 12 +++++++++---
drivers/message/i2o/device.c +11 -5
@@ -217,15 +217,15 @@ static struct i2o_device *i2o_device_all* Returns a pointer to the I2O device on success or negative error code * on failure. */ -static struct i2o_device *i2o_device_add (struct i2o_controller *c, -i2o_lct_entry * entry) +static int i2o_device_add (struct i2o_controller *c,i2o_lct_entry *entry) {struct i2o_device *i2o_dev, *tmp; +int rc; i2o_dev =i2o_device_alloc ();if (IS_ERR (i2o_dev)) {printk (KERN_ERR "i2o: unable to allocate i2o device\n" ); -return i2o_dev; +return PTR_ERR (i2o_dev); } i2o_dev->lct_data = *entry;
@@ -236,7 +236,9 @@ static struct i2o_device *i2o_device_add i2o_dev->iop = c; i2o_dev->device.parent = &c->device; -device_register (&i2o_dev->device); + rc =device_register (&i2o_dev->device); +if (rc) + goto err;list_add_tail (&i2o_dev->list, &c->devices);
@@ -270,7 +272,11 @@ static struct i2o_device *i2o_device_addpr_debug ("i2o: device %s added\n" , i2o_dev->device.bus_id); -return i2o_dev; +return 0 ; + +err: +kfree (i2o_dev); +return rc; }/**
drivers/message/i2o/i2o_scsi.c +9 -3
@@ -220,7 +220,7 @@ static int i2o_scsi_probe(struct deviceu32 id =-1 ;u64 lun =-1 ;int channel =-1 ; -int i; +int i, rc; i2o_shost =i2o_scsi_get_host (c);if (!i2o_shost)
@@ -304,14 +304,20 @@ #endifreturn PTR_ERR (scsi_dev); } -sysfs_create_link (&i2o_dev->device.kobj, &scsi_dev->sdev_gendev.kobj, -"scsi" ); + rc =sysfs_create_link (&i2o_dev->device.kobj, + &scsi_dev->sdev_gendev.kobj,"scsi" ); +if (rc) + goto err;osm_info ("device added (TID: %03x) channel: %d, id: %d, lun: %ld\n" , i2o_dev->lct_data.tid, channel,le32_to_cpu (id), (long unsigned int )le64_to_cpu (lun));return 0 ; + +err: +scsi_remove_device (scsi_dev); +return rc; };static const char *i2o_scsi_info (struct Scsi_Host *SChost)
Alan Cox
NAKAr Mer, 2006-10-11 am 17:41 -0400, ysgrifennodd Jeff Garzik:
Quoted 4 lines
i2o_scsi: handle sysfs failure
i2o_device:
* converti2o_device_add()to return integer error code
NAK, Fix the comments to match the code changes.
drivers/message/i2o/device.c static struct i2o_device *i2o_device_all · line 218
Quoted 7 lines
drivers/message/i2o/device.c +0
-0@@ -217,15 +217,15 @@ static struct i2o_device *i2o_device_all* Returns a pointer to the I2O device on success or negative error code * on failure.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
drivers/message/i2o/device.c static struct i2o_device *i2o_device_all · line 221
Quoted 5 lines
drivers/message/i2o/device.c +1
-2*/ -static struct i2o_device *i2o_device_add (struct i2o_controller *c, -i2o_lct_entry * entry) +static int i2o_device_add (struct i2o_controller *c,i2o_lct_entry *entry) {
Otherwise Ack.