From: Zhouyang Jia <jiazhouyang09@gmail.com> To: unlisted-recipients:; (no To-header on input) Cc: Zhouyang Jia <jiazhouyang09@gmail.com>, Juergen Gross <jgross@suse.com>, Boris Ostrovsky <boris.ostrovsky@oracle.com>, "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, xen-devel@lists.xenproject.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5] scsi: xen-scsifront: add error handling for xenbus_printf Date: Sat, 16 Jun 2018 01:05:01 +0800 [thread overview] Message-ID: <1529082301-59038-1-git-send-email-jiazhouyang09@gmail.com> (raw) In-Reply-To: <1528774962-39173-1-git-send-email-jiazhouyang09@gmail.com> 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: Zhouyang Jia <jiazhouyang09@gmail.com> v1->v2: - Fix dereferencing before checking. v2->v3: - Use xenbus_dev_error to report errors. v3->v4: - Fix compilation errors. v4->v5: - Fix compilation errors. --- drivers/scsi/xen-scsifront.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c index 36f59a1..61389bd 100644 --- a/drivers/scsi/xen-scsifront.c +++ b/drivers/scsi/xen-scsifront.c @@ -654,10 +654,17 @@ static int scsifront_dev_reset_handler(struct scsi_cmnd *sc) static int scsifront_sdev_configure(struct scsi_device *sdev) { struct vscsifrnt_info *info = shost_priv(sdev->host); + int err; - if (info && current == info->curr) - xenbus_printf(XBT_NIL, info->dev->nodename, + if (info && current == info->curr) { + err = xenbus_printf(XBT_NIL, info->dev->nodename, info->dev_state_path, "%d", XenbusStateConnected); + if (err) { + xenbus_dev_error(info->dev, err, + "%s: writing dev_state_path", __func__); + return err; + } + } return 0; } @@ -665,10 +672,15 @@ static int scsifront_sdev_configure(struct scsi_device *sdev) static void scsifront_sdev_destroy(struct scsi_device *sdev) { struct vscsifrnt_info *info = shost_priv(sdev->host); + int err; - if (info && current == info->curr) - xenbus_printf(XBT_NIL, info->dev->nodename, + if (info && current == info->curr) { + err = xenbus_printf(XBT_NIL, info->dev->nodename, 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 = { @@ -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)) { 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, "%d", XenbusStateClosed); + if (err) + xenbus_dev_error(dev, err, + "%s: writing dev_state_path", __func__); } break; case VSCSIFRONT_OP_DEL_LUN: @@ -1019,10 +1034,14 @@ static void scsifront_do_lun_hotplug(struct vscsifrnt_info *info, int op) } break; case VSCSIFRONT_OP_READD_LUN: - if (device_state == XenbusStateConnected) - xenbus_printf(XBT_NIL, dev->nodename, + if (device_state == XenbusStateConnected) { + err = xenbus_printf(XBT_NIL, dev->nodename, info->dev_state_path, "%d", XenbusStateConnected); + if (err) + xenbus_dev_error(dev, err, + "%s: writing dev_state_path", __func__); + } break; default: break; -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Zhouyang Jia <jiazhouyang09@gmail.com> Cc: Zhouyang Jia <jiazhouyang09@gmail.com>, Juergen Gross <jgross@suse.com>, Boris Ostrovsky <boris.ostrovsky@oracle.com>, "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, xen-devel@lists.xenproject.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5] scsi: xen-scsifront: add error handling for xenbus_printf Date: Sat, 16 Jun 2018 01:05:01 +0800 [thread overview] Message-ID: <1529082301-59038-1-git-send-email-jiazhouyang09@gmail.com> (raw) In-Reply-To: <1528774962-39173-1-git-send-email-jiazhouyang09@gmail.com> 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: Zhouyang Jia <jiazhouyang09@gmail.com> v1->v2: - Fix dereferencing before checking. v2->v3: - Use xenbus_dev_error to report errors. v3->v4: - Fix compilation errors. v4->v5: - Fix compilation errors. --- drivers/scsi/xen-scsifront.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c index 36f59a1..61389bd 100644 --- a/drivers/scsi/xen-scsifront.c +++ b/drivers/scsi/xen-scsifront.c @@ -654,10 +654,17 @@ static int scsifront_dev_reset_handler(struct scsi_cmnd *sc) static int scsifront_sdev_configure(struct scsi_device *sdev) { struct vscsifrnt_info *info = shost_priv(sdev->host); + int err; - if (info && current == info->curr) - xenbus_printf(XBT_NIL, info->dev->nodename, + if (info && current == info->curr) { + err = xenbus_printf(XBT_NIL, info->dev->nodename, info->dev_state_path, "%d", XenbusStateConnected); + if (err) { + xenbus_dev_error(info->dev, err, + "%s: writing dev_state_path", __func__); + return err; + } + } return 0; } @@ -665,10 +672,15 @@ static int scsifront_sdev_configure(struct scsi_device *sdev) static void scsifront_sdev_destroy(struct scsi_device *sdev) { struct vscsifrnt_info *info = shost_priv(sdev->host); + int err; - if (info && current == info->curr) - xenbus_printf(XBT_NIL, info->dev->nodename, + if (info && current == info->curr) { + err = xenbus_printf(XBT_NIL, info->dev->nodename, 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 = { @@ -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)) { 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, "%d", XenbusStateClosed); + if (err) + xenbus_dev_error(dev, err, + "%s: writing dev_state_path", __func__); } break; case VSCSIFRONT_OP_DEL_LUN: @@ -1019,10 +1034,14 @@ static void scsifront_do_lun_hotplug(struct vscsifrnt_info *info, int op) } break; case VSCSIFRONT_OP_READD_LUN: - if (device_state == XenbusStateConnected) - xenbus_printf(XBT_NIL, dev->nodename, + if (device_state == XenbusStateConnected) { + err = xenbus_printf(XBT_NIL, dev->nodename, info->dev_state_path, "%d", XenbusStateConnected); + if (err) + xenbus_dev_error(dev, err, + "%s: writing dev_state_path", __func__); + } break; default: break; -- 2.7.4
next prev parent reply other threads:[~2018-06-15 17:05 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-12 3:42 [PATCH] scsi: xen-scsifront: add error handling for xenbus_printf Zhouyang Jia 2018-06-12 3:42 ` Zhouyang Jia 2018-06-13 10:09 ` Finn Thain 2018-06-14 8:13 ` Zhouyang Jia 2018-06-13 10:09 ` Finn Thain 2018-06-14 16:08 ` [PATCH v2] " Zhouyang Jia 2018-06-14 16:08 ` Zhouyang Jia 2018-06-14 16:08 ` Zhouyang Jia 2018-06-14 21:54 ` Boris Ostrovsky 2018-06-14 21:54 ` Boris Ostrovsky 2018-06-14 22:59 ` [PATCH v3] " Zhouyang Jia 2018-06-14 22:59 ` Zhouyang Jia 2018-06-14 23:50 ` kbuild test robot 2018-06-14 23:50 ` kbuild test robot 2018-06-15 2:32 ` kbuild test robot 2018-06-15 2:32 ` kbuild test robot 2018-06-15 5:44 ` kbuild test robot 2018-06-15 5:44 ` kbuild test robot 2018-06-14 22:59 ` Zhouyang Jia 2018-06-15 1:48 ` [PATCH v4] " Zhouyang Jia 2018-06-15 1:48 ` Zhouyang Jia 2018-06-15 6:04 ` kbuild test robot 2018-06-15 6:04 ` kbuild test robot 2018-06-15 11:59 ` kbuild test robot 2018-06-15 11:59 ` kbuild test robot 2018-06-15 1:48 ` Zhouyang Jia 2018-06-15 17:05 ` [PATCH v5] " Zhouyang Jia 2018-06-15 17:05 ` Zhouyang Jia [this message] 2018-06-15 17:05 ` Zhouyang Jia 2018-06-19 12:53 ` Juergen Gross 2018-06-19 12:53 ` Juergen Gross 2018-06-19 13:02 ` Juergen Gross 2018-06-19 13:02 ` Juergen Gross
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1529082301-59038-1-git-send-email-jiazhouyang09@gmail.com \ --to=jiazhouyang09@gmail.com \ --cc=boris.ostrovsky@oracle.com \ --cc=jejb@linux.vnet.ibm.com \ --cc=jgross@suse.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.