|
@@ -316,11 +316,18 @@ static int xenbus_write_transaction(unsigned msg_type,
|
|
|
rc = -ENOMEM;
|
|
|
goto out;
|
|
|
}
|
|
|
+ } else {
|
|
|
+ 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)) {
|
|
|
- kfree(trans);
|
|
|
+ if (msg_type == XS_TRANSACTION_START)
|
|
|
+ kfree(trans);
|
|
|
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_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);
|
|
|
-
|
|
|
kfree(trans);
|
|
|
}
|
|
|
|