aboutsummaryrefslogtreecommitdiffstats
path: root/xen/common/tmem.c
diff options
context:
space:
mode:
authorDan Magenheimer <dan.magenheimer@oracle.com>2012-09-11 14:19:03 +0200
committerDan Magenheimer <dan.magenheimer@oracle.com>2012-09-11 14:19:03 +0200
commit9a2982ce85aec92fb828af34041f41b00b723b62 (patch)
treee7f3b8080a39c5f373053bb2bde80c3a23391046 /xen/common/tmem.c
parentc2433b975018dd36a1ea8be3ca58a7a0bcd2e6e2 (diff)
downloadxen-9a2982ce85aec92fb828af34041f41b00b723b62.tar.gz
xen-9a2982ce85aec92fb828af34041f41b00b723b62.tar.bz2
xen-9a2982ce85aec92fb828af34041f41b00b723b62.zip
tmem: fixup 2010 cleanup patch that breaks tmem save/restore
20918:a3fa6d444b25 "Fix domain reference leaks" (in Feb 2010, by Jan) does some cleanup in addition to the leak fixes. Unfortunately, that cleanup inadvertently resulted in an incorrect fallthrough in a switch statement which breaks tmem save/restore. That broken patch was apparently applied to 4.0-testing and 4.1-testing so those are broken as well. What is the process now for requesting back-patches to 4.0 and 4.1? (Side note: This does not by itself entirely fix save/restore in 4.2.) Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com> Signed-off-by: Jan Beulich <jbeulich@suse.com> Committed-by: Jan Beulich <jbeulich@suse.com>
Diffstat (limited to 'xen/common/tmem.c')
-rw-r--r--xen/common/tmem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/xen/common/tmem.c b/xen/common/tmem.c
index 091080e3f1..6af8faafec 100644
--- a/xen/common/tmem.c
+++ b/xen/common/tmem.c
@@ -2419,6 +2419,7 @@ static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id,
break;
tmh_copy_to_client_buf(buf, pool->uuid, 2);
rc = 0;
+ break;
case TMEMC_SAVE_END:
if ( client == NULL )
break;
@@ -2429,6 +2430,7 @@ static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id,
pgp_free_from_inv_list(client,pgp);
client->frozen = client->was_frozen;
rc = 0;
+ break;
}
return rc;
}