From mboxrd@z Thu Jan 1 00:00:00 1970 From: Praveen Kumar Subject: [PATCH v2 03/20] rb_tree: reorganize code in rb_erase() for additional changes Date: Sat, 17 Jun 2017 15:02:36 +0530 Message-ID: <20170617093253.3990-4-kpraveen.lkml@gmail.com> References: <20170617093253.3990-1-kpraveen.lkml@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170617093253.3990-1-kpraveen.lkml@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, kpraveen.lkml@gmail.com, jbeulich@suse.com List-Id: xen-devel@lists.xenproject.org Rmlyc3QsIG1vdmUgc29tZSBjb2RlIGFyb3VuZCBpbiBvcmRlciB0byBtYWtlIHRoZSBuZXh0IGNo YW5nZSBtb3JlIG9idmlvdXMuCgpbYWtwbUBsaW51eC1mb3VuZGF0aW9uLm9yZzogY29kaW5nLXN0 eWxlIGZpeGVzXQpTaWduZWQtb2ZmLWJ5OiBQZXRlciBaaWpsc3RyYSA8YS5wLnppamxzdHJhQGNo ZWxsby5ubD4KU2lnbmVkLW9mZi1ieTogV29sZnJhbSBTdHJlcHAgPHdzdHJlcHBAZ214LmRlPgpT aWduZWQtb2ZmLWJ5OiBBbmRyZXcgTW9ydG9uIDxha3BtQGxpbnV4LWZvdW5kYXRpb24ub3JnPgpT aWduZWQtb2ZmLWJ5OiBMaW51cyBUb3J2YWxkcyA8dG9ydmFsZHNAbGludXgtZm91bmRhdGlvbi5v cmc+CltMaW51eCBjb21taXQgMTZjMDQ3YWRkM2NlYWYwYWI4ODJlM2UwOTRkMWVjOTA0ZDAyMzEy ZF0KClBvcnRlZCB0byBYZW4uCgpTaWduZWQtb2ZmLWJ5OiBQcmF2ZWVuIEt1bWFyIDxrcHJhdmVl bi5sa21sQGdtYWlsLmNvbT4KLS0tCiB4ZW4vY29tbW9uL3JidHJlZS5jIHwgMTkgKysrKysrKysr Ky0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9yYnRyZWUuYyBiL3hlbi9jb21tb24vcmJ0cmVl LmMKaW5kZXggNzBjYjE1ZjFmZS4uNGI4NWZkNDkyYiAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9y YnRyZWUuYworKysgYi94ZW4vY29tbW9uL3JidHJlZS5jCkBAIC0yMzAsNiArMjMwLDE2IEBAIHZv aWQgcmJfZXJhc2Uoc3RydWN0IHJiX25vZGUgKm5vZGUsIHN0cnVjdCByYl9yb290ICpyb290KQog ICAgICAgICBub2RlID0gbm9kZS0+cmJfcmlnaHQ7CiAgICAgICAgIHdoaWxlICgobGVmdCA9IG5v ZGUtPnJiX2xlZnQpICE9IE5VTEwpCiAgICAgICAgICAgICBub2RlID0gbGVmdDsKKworICAgICAg ICBpZiAocmJfcGFyZW50KG9sZCkpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmIChyYl9wYXJl bnQob2xkKS0+cmJfbGVmdCA9PSBvbGQpCisgICAgICAgICAgICAgICAgcmJfcGFyZW50KG9sZCkt PnJiX2xlZnQgPSBub2RlOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHJiX3Bh cmVudChvbGQpLT5yYl9yaWdodCA9IG5vZGU7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAg cm9vdC0+cmJfbm9kZSA9IG5vZGU7CisKICAgICAgICAgY2hpbGQgPSBub2RlLT5yYl9yaWdodDsK ICAgICAgICAgcGFyZW50ID0gcmJfcGFyZW50KG5vZGUpOwogICAgICAgICBjb2xvciA9IHJiX2Nv bG9yKG5vZGUpOwpAQCAtMjQ2LDE1ICsyNTYsNiBAQCB2b2lkIHJiX2VyYXNlKHN0cnVjdCByYl9u b2RlICpub2RlLCBzdHJ1Y3QgcmJfcm9vdCAqcm9vdCkKICAgICAgICAgbm9kZS0+cmJfcmlnaHQg PSBvbGQtPnJiX3JpZ2h0OwogICAgICAgICBub2RlLT5yYl9sZWZ0ID0gb2xkLT5yYl9sZWZ0Owog Ci0gICAgICAgIGlmIChyYl9wYXJlbnQob2xkKSkKLSAgICAgICAgewotICAgICAgICAgICAgaWYg KHJiX3BhcmVudChvbGQpLT5yYl9sZWZ0ID09IG9sZCkKLSAgICAgICAgICAgICAgICByYl9wYXJl bnQob2xkKS0+cmJfbGVmdCA9IG5vZGU7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAg ICAgcmJfcGFyZW50KG9sZCktPnJiX3JpZ2h0ID0gbm9kZTsKLSAgICAgICAgfSBlbHNlCi0gICAg ICAgICAgICByb290LT5yYl9ub2RlID0gbm9kZTsKLQogICAgICAgICByYl9zZXRfcGFyZW50KG9s ZC0+cmJfbGVmdCwgbm9kZSk7CiAgICAgICAgIGlmIChvbGQtPnJiX3JpZ2h0KQogICAgICAgICAg ICAgcmJfc2V0X3BhcmVudChvbGQtPnJiX3JpZ2h0LCBub2RlKTsKLS0gCjIuMTIuMAoKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWls aW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hl bi1kZXZlbAo=