diff options
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_fs.c | 2 | ||||
| -rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index 8dc2bb781605..b3684060465e 100644 --- a/drivers/infiniband/hw/ipath/ipath_fs.c +++ b/drivers/infiniband/hw/ipath/ipath_fs.c | |||
| @@ -347,7 +347,7 @@ static int ipathfs_fill_super(struct super_block *sb, void *data, | |||
| 347 | spin_unlock_irqrestore(&ipath_devs_lock, flags); | 347 | spin_unlock_irqrestore(&ipath_devs_lock, flags); |
| 348 | ret = create_device_files(sb, dd); | 348 | ret = create_device_files(sb, dd); |
| 349 | if (ret) { | 349 | if (ret) { |
| 350 | deactivate_super(sb); | 350 | deactivate_locked_super(sb); |
| 351 | goto bail; | 351 | goto bail; |
| 352 | } | 352 | } |
| 353 | spin_lock_irqsave(&ipath_devs_lock, flags); | 353 | spin_lock_irqsave(&ipath_devs_lock, flags); |
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index 13d7674b293d..75223f50de58 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.c +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c | |||
| @@ -599,6 +599,7 @@ static struct scsi_host_template iscsi_iser_sht = { | |||
| 599 | .eh_abort_handler = iscsi_eh_abort, | 599 | .eh_abort_handler = iscsi_eh_abort, |
| 600 | .eh_device_reset_handler= iscsi_eh_device_reset, | 600 | .eh_device_reset_handler= iscsi_eh_device_reset, |
| 601 | .eh_target_reset_handler= iscsi_eh_target_reset, | 601 | .eh_target_reset_handler= iscsi_eh_target_reset, |
| 602 | .target_alloc = iscsi_target_alloc, | ||
| 602 | .use_clustering = DISABLE_CLUSTERING, | 603 | .use_clustering = DISABLE_CLUSTERING, |
| 603 | .proc_name = "iscsi_iser", | 604 | .proc_name = "iscsi_iser", |
| 604 | .this_id = -1, | 605 | .this_id = -1, |