| Message ID | 1498636503-22484-1-git-send-email-hare@suse.de (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Mike Snitzer |
| Headers | show |
On Wed, Jun 28, 2017 at 09:55:03AM +0200, Hannes Reinecke wrote: > __rdev_sectors() might be called for an invalid/non-existing > RAID set during raid_ctr(), which is perfectly fine and no > reason to panic. > > Signed-off-by: Hannes Reinecke <hare@suse.com> > --- > drivers/md/dm-raid.c | 3 ++- > drivers/scsi/pmcraid.c | 2 +- > drivers/scsi/qla4xxx/ql4_os.c | 2 +- Ahm, accidential git commit -a?
On 06/28/2017 09:55 AM, Hannes Reinecke wrote: > __rdev_sectors() might be called for an invalid/non-existing > RAID set during raid_ctr(), which is perfectly fine and no > reason to panic. > > Signed-off-by: Hannes Reinecke <hare@suse.com> > --- > drivers/md/dm-raid.c | 3 ++- > drivers/scsi/pmcraid.c | 2 +- > drivers/scsi/qla4xxx/ql4_os.c | 2 +- > 3 files changed, 4 insertions(+), 3 deletions(-) > Gnaa. Those bits shouldn't be here. Will be resending. Cheers, Hannes
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 7d89322..9bbb596 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -1571,7 +1571,8 @@ static sector_t __rdev_sectors(struct raid_set *rs) return rdev->sectors; } - BUG(); /* Constructor ensures we got some. */ + /* No valid raid devices */ + return 0; } /* Calculate the sectors per device and per array used for @rs */ diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 56928d6..4b66b92 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c @@ -3089,7 +3089,7 @@ static int pmcraid_eh_target_reset_handler(struct scsi_cmnd *scmd) /** * pmcraid_eh_host_reset_handler - adapter reset handler callback * - * @scmd: pointer to scsi_cmd that was sent to a resource of adapter + * @shost: pointer to scsi_host * * Initiates adapter reset to bring it up to operational state * diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 5d55de5..11bd2da 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -9367,7 +9367,7 @@ static int qla4xxx_is_eh_active(struct Scsi_Host *shost) /** * qla4xxx_eh_host_reset - kernel callback - * @cmd: Pointer to Linux's SCSI command structure + * @host: Pointer to Linux's SCSI host structure * * This routine is invoked by the Linux kernel to perform fatal error * recovery on the specified adapter.
__rdev_sectors() might be called for an invalid/non-existing RAID set during raid_ctr(), which is perfectly fine and no reason to panic. Signed-off-by: Hannes Reinecke <hare@suse.com> --- drivers/md/dm-raid.c | 3 ++- drivers/scsi/pmcraid.c | 2 +- drivers/scsi/qla4xxx/ql4_os.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)