42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Dan Magenheimer <dan.magenheimer@oracle.com>
|
||
|
|
# Date 1347365943 -7200
|
||
|
|
# Node ID 16e0392c6594b1757bbaa82076630a73d843229b
|
||
|
|
# Parent 0520982a602a3ac06dd5bc573ddaff5edc9c6987
|
||
|
|
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>
|
||
|
|
|
||
|
|
--- a/xen/common/tmem.c
|
||
|
|
+++ b/xen/common/tmem.c
|
||
|
|
@@ -2419,6 +2419,7 @@ static NOINLINE int tmemc_save_subop(int
|
||
|
|
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
|
||
|
|
pgp_free_from_inv_list(client,pgp);
|
||
|
|
client->frozen = client->was_frozen;
|
||
|
|
rc = 0;
|
||
|
|
+ break;
|
||
|
|
}
|
||
|
|
return rc;
|
||
|
|
}
|