summaryrefslogtreecommitdiffstats
path: root/drivers/xen/xenbus/xenbus_xs.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-07-15 10:26:04 +0200
committerIngo Molnar <mingo@kernel.org>2016-07-15 10:26:04 +0200
commit38452af2424dc99854c78523d74b260fa8a984f0 (patch)
tree0dc49c27e1a58a0b35c23db05d85d2e8571ea471 /drivers/xen/xenbus/xenbus_xs.c
parentdcb32d9913b7ed527b135a7e221f8d14b67bb952 (diff)
parentbe8a18e2e98e04a5def5887d913b267865562448 (diff)
downloadop-kernel-dev-38452af2424dc99854c78523d74b260fa8a984f0.zip
op-kernel-dev-38452af2424dc99854c78523d74b260fa8a984f0.tar.gz
Merge branch 'x86/asm' into x86/mm, to resolve conflicts
Conflicts: tools/testing/selftests/x86/Makefile Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/xen/xenbus/xenbus_xs.c')
-rw-r--r--drivers/xen/xenbus/xenbus_xs.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
index 374b12a..22f7cd7 100644
--- a/drivers/xen/xenbus/xenbus_xs.c
+++ b/drivers/xen/xenbus/xenbus_xs.c
@@ -232,10 +232,10 @@ static void transaction_resume(void)
void *xenbus_dev_request_and_reply(struct xsd_sockmsg *msg)
{
void *ret;
- struct xsd_sockmsg req_msg = *msg;
+ enum xsd_sockmsg_type type = msg->type;
int err;
- if (req_msg.type == XS_TRANSACTION_START)
+ if (type == XS_TRANSACTION_START)
transaction_start();
mutex_lock(&xs_state.request_mutex);
@@ -249,12 +249,8 @@ void *xenbus_dev_request_and_reply(struct xsd_sockmsg *msg)
mutex_unlock(&xs_state.request_mutex);
- if (IS_ERR(ret))
- return ret;
-
if ((msg->type == XS_TRANSACTION_END) ||
- ((req_msg.type == XS_TRANSACTION_START) &&
- (msg->type == XS_ERROR)))
+ ((type == XS_TRANSACTION_START) && (msg->type == XS_ERROR)))
transaction_end();
return ret;
OpenPOWER on IntegriCloud