On Mon, Apr 02 2012 at 12:43pm -0400, Hannes Reinecke <hare@xxxxxxx> wrote: > This patch allows to pass in a NULL hardware handler to > scsi_dh_attach(), causing the reference count of the existing > hardware handler to be increased. > An error will be returned if no hardware handler is attached. > > Signed-off-by: Hannes Reinecke <hare@xxxxxxx> > --- > drivers/scsi/device_handler/scsi_dh.c | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/device_handler/scsi_dh.c b/drivers/scsi/device_handler/scsi_dh.c > index 48e46f5..77fa67e 100644 > --- a/drivers/scsi/device_handler/scsi_dh.c > +++ b/drivers/scsi/device_handler/scsi_dh.c > @@ -475,10 +475,14 @@ int scsi_dh_attach(struct request_queue *q, const char *name) > { > unsigned long flags; > struct scsi_device *sdev; > - struct scsi_device_handler *scsi_dh; > + struct scsi_device_handler *scsi_dh = NULL; > int err = 0; > > - scsi_dh = get_device_handler(name); > + if (name) { > + scsi_dh = get_device_handler(name); > + } else if (sdev->scsi_dh_data) { > + scsi_dh = sdev->scsi_dh_data->scsi_dh; > + } Extra brackets aren't needed. But otherwise: Acked-by: Mike Snitzer <snitzer@xxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html