From: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
To: kvm@vger.kernel.org, linux-s390@vger.kernel.org
Cc: bjsdjshi@linux.vnet.ibm.com, cornelia.huck@de.ibm.com,
borntraeger@de.ibm.com, dan.carpenter@oracle.com
Subject: [PATCH 2/2] vfio: ccw: improve error handling for vfio_ccw_mdev_remove
Date: Wed, 12 Apr 2017 11:08:16 +0200 [thread overview]
Message-ID: <20170412090816.79108-3-bjsdjshi@linux.vnet.ibm.com> (raw)
In-Reply-To: <20170412090816.79108-1-bjsdjshi@linux.vnet.ibm.com>
When vfio_ccw_mdev_reset fails during the remove process of the mdev,
the current implementation simply returns.
The failure indicates that the subchannel device is in a NOT_OPER state,
thus the right thing to do should be removing the mdev.
While we are at here, reverse the condition check to make the code more
concise and readable.
Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
---
drivers/s390/cio/vfio_ccw_ops.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/s390/cio/vfio_ccw_ops.c b/drivers/s390/cio/vfio_ccw_ops.c
index 55d0c87..e72abbc 100644
--- a/drivers/s390/cio/vfio_ccw_ops.c
+++ b/drivers/s390/cio/vfio_ccw_ops.c
@@ -126,19 +126,14 @@ static int vfio_ccw_mdev_remove(struct mdev_device *mdev)
{
struct vfio_ccw_private *private =
dev_get_drvdata(mdev_parent_dev(mdev));
- int ret;
-
- if ((private->state == VFIO_CCW_STATE_NOT_OPER) ||
- (private->state == VFIO_CCW_STATE_STANDBY))
- goto out;
-
- ret = vfio_ccw_mdev_reset(mdev);
- if (ret)
- return ret;
- private->state = VFIO_CCW_STATE_STANDBY;
+ if ((private->state != VFIO_CCW_STATE_NOT_OPER) &&
+ (private->state != VFIO_CCW_STATE_STANDBY)) {
+ if (!vfio_ccw_mdev_reset(mdev))
+ private->state = VFIO_CCW_STATE_STANDBY;
+ /* The state will be NOT_OPER on error. */
+ }
-out:
private->mdev = NULL;
atomic_inc(&private->avail);
--
2.10.2
next prev parent reply other threads:[~2017-04-12 9:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-12 9:08 [PATCH 0/2] vfio: ccw: code cleanup and bugfix Dong Jia Shi
2017-04-12 9:08 ` [PATCH 1/2] vfio: ccw: remove unnecessary NULL checks of a pointer Dong Jia Shi
2017-04-12 9:08 ` Dong Jia Shi [this message]
2017-04-12 10:47 ` [PATCH 0/2] vfio: ccw: code cleanup and bugfix Cornelia Huck
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=20170412090816.79108-3-bjsdjshi@linux.vnet.ibm.com \
--to=bjsdjshi@linux.vnet.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cornelia.huck@de.ibm.com \
--cc=dan.carpenter@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.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: link
Be 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.