Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
xen
/
xenbus
/
xenbus_dev_frontend.c
diff --git
a/kernel/drivers/xen/xenbus/xenbus_dev_frontend.c
b/kernel/drivers/xen/xenbus/xenbus_dev_frontend.c
index
9433e46
..
0e0eb10
100644
(file)
--- a/
kernel/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/
kernel/drivers/xen/xenbus/xenbus_dev_frontend.c
@@
-316,11
+316,18
@@
static int xenbus_write_transaction(unsigned msg_type,
rc = -ENOMEM;
goto out;
}
rc = -ENOMEM;
goto out;
}
+ } else if (msg_type == XS_TRANSACTION_END) {
+ list_for_each_entry(trans, &u->transactions, list)
+ if (trans->handle.id == u->u.msg.tx_id)
+ break;
+ if (&trans->list == &u->transactions)
+ return -ESRCH;
}
reply = xenbus_dev_request_and_reply(&u->u.msg);
if (IS_ERR(reply)) {
}
reply = xenbus_dev_request_and_reply(&u->u.msg);
if (IS_ERR(reply)) {
- kfree(trans);
+ if (msg_type == XS_TRANSACTION_START)
+ kfree(trans);
rc = PTR_ERR(reply);
goto out;
}
rc = PTR_ERR(reply);
goto out;
}
@@
-333,12
+340,7
@@
static int xenbus_write_transaction(unsigned msg_type,
list_add(&trans->list, &u->transactions);
}
} else if (u->u.msg.type == XS_TRANSACTION_END) {
list_add(&trans->list, &u->transactions);
}
} else if (u->u.msg.type == XS_TRANSACTION_END) {
- list_for_each_entry(trans, &u->transactions, list)
- if (trans->handle.id == u->u.msg.tx_id)
- break;
- BUG_ON(&trans->list == &u->transactions);
list_del(&trans->list);
list_del(&trans->list);
-
kfree(trans);
}
kfree(trans);
}