From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Magenheimer Subject: [PATCH] tmem: fixup 2010 cleanup patch that breaks tmem save/restore Date: Tue, 4 Sep 2012 14:25:46 -0700 (PDT) Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="__134679398768762311abhmt111.oracle.com" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org, keir@xen.org Cc: Kurt Hackel , Konrad Wilk List-Id: xen-devel@lists.xenproject.org --__134679398768762311abhmt111.oracle.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable 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 diff -r 1dfbae8dd282 xen/common/tmem.c --- a/xen/common/tmem.c=09Fri Aug 31 11:13:49 2012 +0100 +++ b/xen/common/tmem.c=09Tue Sep 04 15:17:29 2012 -0600 @@ -2404,6 +2404,7 @@ static NOINLINE int tmemc_save_subop(int *uuid++ =3D pool->uuid[0]; *uuid =3D pool->uuid[1]; rc =3D 0; + break; case TMEMC_SAVE_END: client->live_migrating =3D 0; if ( !list_empty(&client->persistent_invalidated_list) ) @@ -2412,6 +2413,7 @@ static NOINLINE int tmemc_save_subop(int pgp_free_from_inv_list(client,pgp); client->frozen =3D client->was_frozen; rc =3D 0; + break; } return rc; } --__134679398768762311abhmt111.oracle.com Content-Type: application/octet-stream; name="tmem-fix-switch-in-tmemsave.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="tmem-fix-switch-in-tmemsave.patch" ZGlmZiAtciAxZGZiYWU4ZGQyODIgeGVuL2NvbW1vbi90bWVtLmMKLS0tIGEveGVuL2NvbW1vbi90 bWVtLmMJRnJpIEF1ZyAzMSAxMToxMzo0OSAyMDEyICswMTAwCisrKyBiL3hlbi9jb21tb24vdG1l bS5jCVR1ZSBTZXAgMDQgMTU6MTc6MjkgMjAxMiAtMDYwMApAQCAtMjQwNCw2ICsyNDA0LDcgQEAg c3RhdGljIE5PSU5MSU5FIGludCB0bWVtY19zYXZlX3N1Ym9wKGludAogICAgICAgICAqdXVpZCsr ID0gcG9vbC0+dXVpZFswXTsKICAgICAgICAgKnV1aWQgPSBwb29sLT51dWlkWzFdOwogICAgICAg ICByYyA9IDA7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgVE1FTUNfU0FWRV9FTkQ6CiAgICAg ICAgIGNsaWVudC0+bGl2ZV9taWdyYXRpbmcgPSAwOwogICAgICAgICBpZiAoICFsaXN0X2VtcHR5 KCZjbGllbnQtPnBlcnNpc3RlbnRfaW52YWxpZGF0ZWRfbGlzdCkgKQpAQCAtMjQxMiw2ICsyNDEz LDcgQEAgc3RhdGljIE5PSU5MSU5FIGludCB0bWVtY19zYXZlX3N1Ym9wKGludAogICAgICAgICAg ICAgICAgIHBncF9mcmVlX2Zyb21faW52X2xpc3QoY2xpZW50LHBncCk7CiAgICAgICAgIGNsaWVu dC0+ZnJvemVuID0gY2xpZW50LT53YXNfZnJvemVuOwogICAgICAgICByYyA9IDA7CisgICAgICAg IGJyZWFrOwogICAgIH0KICAgICByZXR1cm4gcmM7CiB9Cg== --__134679398768762311abhmt111.oracle.com Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --__134679398768762311abhmt111.oracle.com--