Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93efbd39 authored by Zhouyang Jia's avatar Zhouyang Jia Committed by Juergen Gross
Browse files

scsi: xen-scsifront: add error handling for xenbus_printf 



When xenbus_printf fails, the lack of error-handling code may
cause unexpected results.

This patch adds error-handling code after calling xenbus_printf.

Signed-off-by: default avatarZhouyang Jia <jiazhouyang09@gmail.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 6e3cc2a6

drivers/scsi/xen-scsifront.c

+26 −7
Original line number Original line Diff line number Diff line
@@ -654,10 +654,17 @@ static int scsifront_dev_reset_handler(struct scsi_cmnd *sc) 
static int scsifront_sdev_configure(struct scsi_device *sdev)

static int scsifront_sdev_configure(struct scsi_device *sdev)

{

{

	struct vscsifrnt_info *info = shost_priv(sdev->host);

	struct vscsifrnt_info *info = shost_priv(sdev->host);

	int err;





	if (info && current == info->curr)

	if (info && current == info->curr) {

		xenbus_printf(XBT_NIL, info->dev->nodename,

		err = xenbus_printf(XBT_NIL, info->dev->nodename,

			      info->dev_state_path, "%d", XenbusStateConnected);

			      info->dev_state_path, "%d", XenbusStateConnected);

		if (err) {

			xenbus_dev_error(info->dev, err,

				"%s: writing dev_state_path", __func__);

			return err;

		}

	}





	return 0;

	return 0;

}

}
@@ -665,10 +672,15 @@ static int scsifront_sdev_configure(struct scsi_device *sdev) 
static void scsifront_sdev_destroy(struct scsi_device *sdev)

static void scsifront_sdev_destroy(struct scsi_device *sdev)

{

{

	struct vscsifrnt_info *info = shost_priv(sdev->host);

	struct vscsifrnt_info *info = shost_priv(sdev->host);

	int err;





	if (info && current == info->curr)

	if (info && current == info->curr) {

		xenbus_printf(XBT_NIL, info->dev->nodename,

		err = xenbus_printf(XBT_NIL, info->dev->nodename,

			      info->dev_state_path, "%d", XenbusStateClosed);

			      info->dev_state_path, "%d", XenbusStateClosed);

		if (err)

			xenbus_dev_error(info->dev, err,

				"%s: writing dev_state_path", __func__);

	}

}

}





static struct scsi_host_template scsifront_sht = {

static struct scsi_host_template scsifront_sht = {
@@ -1003,9 +1015,12 @@ static void scsifront_do_lun_hotplug(struct vscsifrnt_info *info, int op) 




			if (scsi_add_device(info->host, chn, tgt, lun)) {

			if (scsi_add_device(info->host, chn, tgt, lun)) {

				dev_err(&dev->dev, "scsi_add_device\n");

				dev_err(&dev->dev, "scsi_add_device\n");

				xenbus_printf(XBT_NIL, dev->nodename,

				err = xenbus_printf(XBT_NIL, dev->nodename,

					      info->dev_state_path,

					      info->dev_state_path,

					      "%d", XenbusStateClosed);

					      "%d", XenbusStateClosed);

				if (err)

					xenbus_dev_error(dev, err,

						"%s: writing dev_state_path", __func__);

			}

			}

			break;

			break;

		case VSCSIFRONT_OP_DEL_LUN:

		case VSCSIFRONT_OP_DEL_LUN:
@@ -1019,10 +1034,14 @@ static void scsifront_do_lun_hotplug(struct vscsifrnt_info *info, int op) 
			}

			}

			break;

			break;

		case VSCSIFRONT_OP_READD_LUN:

		case VSCSIFRONT_OP_READD_LUN:

			if (device_state == XenbusStateConnected)

			if (device_state == XenbusStateConnected) {

				xenbus_printf(XBT_NIL, dev->nodename,

				err = xenbus_printf(XBT_NIL, dev->nodename,

					      info->dev_state_path,

					      info->dev_state_path,

					      "%d", XenbusStateConnected);

					      "%d", XenbusStateConnected);

				if (err)

					xenbus_dev_error(dev, err,

						"%s: writing dev_state_path", __func__);

			}

			break;

			break;

		default:

		default:

			break;

			break;