Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mLOo7-0005T1-6n for pgsql-hackers@arkaria.postgresql.org; Wed, 01 Sep 2021 11:53:31 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1mLOo5-0003P7-VJ for pgsql-hackers@arkaria.postgresql.org; Wed, 01 Sep 2021 11:53:29 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mLOo5-0003Ox-JJ for pgsql-hackers@lists.postgresql.org; Wed, 01 Sep 2021 11:53:29 +0000 Received: from mail-yb1-xb2a.google.com ([2607:f8b0:4864:20::b2a]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1mLOo2-0000vg-LP for pgsql-hackers@postgresql.org; Wed, 01 Sep 2021 11:53:29 +0000 Received: by mail-yb1-xb2a.google.com with SMTP id r4so4552076ybp.4 for ; Wed, 01 Sep 2021 04:53:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=1Gq4MQU/CRbs18SM3Rv9sThpTuFO7O1xEGm2lNesc3o=; b=ZjLhOOjYAWCxHX8GOG43CYhqRGQTC7ix4CrUPyo9H8RqbwqN2rh1ex/gLPWt/zPIVx g4FzGghD7CStNYtNRbm4iXhciUpJeDKO9yswNxKVDrzOQCdmxioMQZmS8GXUEmRhzf/w 0x1WMiN5nW8HFyXQde6q0cAGdPo3JJ61hbB4uNtzWfUYVUMRgrsBtyVhG5ksNOEyxpK+ 0Af6fx0alHPp5py456AtjvYJBmap42J+saZ3/HJ/Htw2EU4qK0qwa8EfrGZ6ntK7qmKj 2UfszX6UoG7jLLaqStDVDUhJu7jf/Oax/XqDey7DkdaD7Xsp38OOmOmZJfm8Eq3y67xh 1gZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=1Gq4MQU/CRbs18SM3Rv9sThpTuFO7O1xEGm2lNesc3o=; b=HR7NlmvUz1kwVtX0Zt3e4Q6/KqDTn2DbjgA+38jGdOhR3soYBu9KZfTgsOsv86HAxo yAYqwwF1YMhXXDWyXfUt+RobeWllSKbYUmQuBgvlx8TVLmaR9X0Mh/Y7whg5J6ReZ2GR s5YE0ZEriqWXQM1rGfFlKXF4KQejZ6UlcRQ5jETEHi3HZGkL6ZK4fhMBdjZE/DdOc8cR 9e1z7joGI1Xx3DHYN3qGvHKXX9BHqiqRw2jj9JnPJ5pzCQj0qYnxbkkqPybgIo0A2f+2 moLur1HodJj2FXpENhEydFmVGQYFcMkEXDvs7CQLYEGX0RRZVZ+l6ytg98d+Fs58Y1JR Gufw== X-Gm-Message-State: AOAM531oS8aFyoJfm3QNhzhfhWmMKyEps4w+wP0DvaUwLUenLjpn2LXN 9Epg5CKbVJ6Huf03a2/bzKNxlt8QdTyZNdvrddg= X-Google-Smtp-Source: ABdhPJyz2XkW/j536o2DPDaJ6ZzLs/5EJhlScMZTaWJGO61cR/NAATM9OQ4hNAk+kdiQVfJOQ5CcHURHXJFjR0DE6ik= X-Received: by 2002:a5b:f0c:: with SMTP id x12mr37084059ybr.340.1630497204562; Wed, 01 Sep 2021 04:53:24 -0700 (PDT) MIME-Version: 1.0 References: <20210812082237.in7l5x3rc4gxhgjh@alap3.anarazel.de> <20210812124819.5mrurb6ueizmqgru@alap3.anarazel.de> <20210813155940.kp7mdg3ynl2hodqk@alap3.anarazel.de> <20210817110427.yd5i7iostgqf5gvt@alap3.anarazel.de> In-Reply-To: From: Amit Kapila Date: Wed, 1 Sep 2021 17:23:13 +0530 Message-ID: Subject: Re: Separate out FileSet from SharedFileSet (was Re: pgsql: pgstat: Bring up pgstat in BaseInit() to fix uninitialized use o) To: Dilip Kumar Cc: "houzj.fnst@fujitsu.com" , Andres Freund , Thomas Munro , pgsql-hackers , Masahiko Sawada , Tom Lane Content-Type: multipart/mixed; boundary="000000000000b10e9c05caedb643" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --000000000000b10e9c05caedb643 Content-Type: text/plain; charset="UTF-8" On Wed, Sep 1, 2021 at 1:53 PM Dilip Kumar wrote: > The latest patch looks good to me. I have made some changes in the comments, see attached. I am planning to push this tomorrow unless you or others have any comments on it. -- With Regards, Amit Kapila. --000000000000b10e9c05caedb643 Content-Type: application/octet-stream; name="v8-0001-Optimize-fileset-usage-in-apply-worker.patch" Content-Disposition: attachment; filename="v8-0001-Optimize-fileset-usage-in-apply-worker.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kt1fvsso0 RnJvbSA1Yzk3MTJmMjEwZTk2Njk0MDQ0ODc5MmU2NjdjMzQ5NmY3OGE2NDJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWxpcCBLdW1hciA8ZGlsaXBrdW1hckBsb2NhbGhvc3QubG9j YWxkb21haW4+CkRhdGU6IEZyaSwgMjcgQXVnIDIwMjEgMTE6NDk6MTIgKzA1MzAKU3ViamVjdDog W1BBVENIIHY4XSBPcHRpbWl6ZSBmaWxlc2V0IHVzYWdlIGluIGFwcGx5IHdvcmtlci4KClVzZSBv bmUgZmlsZXNldCBmb3IgdGhlIGVudGlyZSB3b3JrZXIgbGlmZXRpbWUgaW5zdGVhZCBvZiB1c2lu ZwpzZXBhcmF0ZSBmaWxlc2V0cyBmb3IgZWFjaCBzdHJlYW1pbmcgdHJhbnNhY3Rpb24uIE5vdywg dGhlCmNoYW5nZXMvc3VieGFjdHMgZmlsZXMgZm9yIGV2ZXJ5IHN0cmVhbWluZyB0cmFuc2FjdGlv biB3aWxsIGJlCmNyZWF0ZWQgdW5kZXIgdGhlIHNhbWUgZmlsZXNldCBhbmQgdGhlIGZpbGVzIHdp bGwgYmUgZGVsZXRlZAphZnRlciB0aGUgdHJhbnNhY3Rpb24gaXMgY29tcGxldGVkLgoKVGhpcyBw YXRjaCBleHRlbmRzIHRoZSBCdWZGaWxlT3BlbkZpbGVTZXQgYW5kIEJ1ZkZpbGVEZWxldGVGaWxl U2V0CkFQSXMgdG8gYWxsb3cgdXNlcnMgdG8gc3BlY2lmeSB3aGV0aGVyIHRvIGdpdmUgYW4gZXJy b3Igb24gbWlzc2luZwpmaWxlcy4KCkF1dGhvcjogRGlsaXAgS3VtYXIsIGJhc2VkIG9uIHN1Z2dl c3Rpb24gYnkgVGhvbWFzIE11bnJvClJldmlld2VkLWJ5OiBIb3UgWmhpamllLCBNYXNhaGlrbyBT YXdhZGEsIEFtaXQgS2FwaWxhCkRpc2N1c3Npb246IGh0dHBzOi8vcG9zdGdyLmVzL20vRTFtQ0M2 VS0wMDA0SWstRnNAZ2VtdWxvbi5wb3N0Z3Jlc3FsLm9yZwotLS0KIHNyYy9iYWNrZW5kL3JlcGxp Y2F0aW9uL2xvZ2ljYWwvbGF1bmNoZXIuYyB8ICAgNiArLQogc3JjL2JhY2tlbmQvcmVwbGljYXRp b24vbG9naWNhbC93b3JrZXIuYyAgIHwgMjU3ICsrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiBzcmMvYmFja2VuZC9zdG9yYWdlL2ZpbGUvYnVmZmlsZS5jICAgICAgICAgfCAgMjIgKystCiBz cmMvYmFja2VuZC91dGlscy9zb3J0L2xvZ3RhcGUuYyAgICAgICAgICAgfCAgIDIgKy0KIHNyYy9i YWNrZW5kL3V0aWxzL3NvcnQvc2hhcmVkdHVwbGVzdG9yZS5jICB8ICAgMyArLQogc3JjL2luY2x1 ZGUvcmVwbGljYXRpb24vd29ya2VyX2ludGVybmFsLmggIHwgIDEwICstCiBzcmMvaW5jbHVkZS9z dG9yYWdlL2J1ZmZpbGUuaCAgICAgICAgICAgICAgfCAgIDUgKy0KIDcgZmlsZXMgY2hhbmdlZCwg ODYgaW5zZXJ0aW9ucygrKSwgMjE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9iYWNr ZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwvbGF1bmNoZXIuYyBiL3NyYy9iYWNrZW5kL3JlcGxpY2F0 aW9uL2xvZ2ljYWwvbGF1bmNoZXIuYwppbmRleCA4YjE3NzJkLi4zZmI0Y2FhIDEwMDY0NAotLS0g YS9zcmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL2xhdW5jaGVyLmMKKysrIGIvc3JjL2Jh Y2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC9sYXVuY2hlci5jCkBAIC0zNzksNiArMzc5LDcgQEAg cmV0cnk6CiAJd29ya2VyLT5yZWxpZCA9IHJlbGlkOwogCXdvcmtlci0+cmVsc3RhdGUgPSBTVUJS RUxfU1RBVEVfVU5LTk9XTjsKIAl3b3JrZXItPnJlbHN0YXRlX2xzbiA9IEludmFsaWRYTG9nUmVj UHRyOworCXdvcmtlci0+c3RyZWFtX2ZpbGVzZXQgPSBOVUxMOwogCXdvcmtlci0+bGFzdF9sc24g PSBJbnZhbGlkWExvZ1JlY1B0cjsKIAlUSU1FU1RBTVBfTk9CRUdJTih3b3JrZXItPmxhc3Rfc2Vu ZF90aW1lKTsKIAlUSU1FU1RBTVBfTk9CRUdJTih3b3JrZXItPmxhc3RfcmVjdl90aW1lKTsKQEAg LTY0OCw4ICs2NDksOSBAQCBsb2dpY2FscmVwX3dvcmtlcl9vbmV4aXQoaW50IGNvZGUsIERhdHVt IGFyZykKIAogCWxvZ2ljYWxyZXBfd29ya2VyX2RldGFjaCgpOwogCi0JLyogQ2xlYW51cCBmaWxl c2V0cyB1c2VkIGZvciBzdHJlYW1pbmcgdHJhbnNhY3Rpb25zLiAqLwotCWxvZ2ljYWxyZXBfd29y a2VyX2NsZWFudXBmaWxlc2V0KCk7CisJLyogQ2xlYW51cCBmaWxlc2V0IHVzZWQgZm9yIHN0cmVh bWluZyB0cmFuc2FjdGlvbnMuICovCisJaWYgKE15TG9naWNhbFJlcFdvcmtlci0+c3RyZWFtX2Zp bGVzZXQgIT0gTlVMTCkKKwkJRmlsZVNldERlbGV0ZUFsbChNeUxvZ2ljYWxSZXBXb3JrZXItPnN0 cmVhbV9maWxlc2V0KTsKIAogCUFwcGx5TGF1bmNoZXJXYWtldXAoKTsKIH0KZGlmZiAtLWdpdCBh L3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwvd29ya2VyLmMgYi9zcmMvYmFja2VuZC9y ZXBsaWNhdGlvbi9sb2dpY2FsL3dvcmtlci5jCmluZGV4IGJmYjdkMWEuLjhkOTZjOTIgMTAwNjQ0 Ci0tLSBhL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwvd29ya2VyLmMKKysrIGIvc3Jj L2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC93b3JrZXIuYwpAQCAtMjM2LDIwICsyMzYsNiBA QCBzdGF0aWMgQXBwbHlFcnJvckNhbGxiYWNrQXJnIGFwcGx5X2Vycm9yX2NhbGxiYWNrX2FyZyA9 CiAJLnRzID0gMCwKIH07CiAKLS8qCi0gKiBTdHJlYW0geGlkIGhhc2ggZW50cnkuIFdoZW5ldmVy IHdlIHNlZSBhIG5ldyB4aWQgd2UgY3JlYXRlIHRoaXMgZW50cnkgaW4gdGhlCi0gKiB4aWRoYXNo IGFuZCBhbG9uZyB3aXRoIGl0IGNyZWF0ZSB0aGUgc3RyZWFtaW5nIGZpbGUgYW5kIHN0b3JlIHRo ZSBmaWxlc2V0IGhhbmRsZS4KLSAqIFRoZSBzdWJ4YWN0IGZpbGUgaXMgY3JlYXRlZCBpZmYgdGhl cmUgaXMgYW55IHN1YnhhY3QgaW5mbyB1bmRlciB0aGlzIHhpZC4gVGhpcwotICogZW50cnkgaXMg dXNlZCBvbiB0aGUgc3Vic2VxdWVudCBzdHJlYW1zIGZvciB0aGUgeGlkIHRvIGdldCB0aGUgY29y cmVzcG9uZGluZwotICogZmlsZXNldCBoYW5kbGVzLCBzbyBzdG9yaW5nIHRoZW0gaW4gaGFzaCBt YWtlcyB0aGUgc2VhcmNoIGZhc3Rlci4KLSAqLwotdHlwZWRlZiBzdHJ1Y3QgU3RyZWFtWGlkSGFz aAotewotCVRyYW5zYWN0aW9uSWQgeGlkOwkJCS8qIHhpZCBpcyB0aGUgaGFzaCBrZXkgYW5kIG11 c3QgYmUgZmlyc3QgKi8KLQlGaWxlU2V0ICAgICpzdHJlYW1fZmlsZXNldDsgLyogZmlsZSBzZXQg Zm9yIHN0cmVhbSBkYXRhICovCi0JRmlsZVNldCAgICAqc3VieGFjdF9maWxlc2V0OwkvKiBmaWxl IHNldCBmb3Igc3VieGFjdCBpbmZvICovCi19IFN0cmVhbVhpZEhhc2g7Ci0KIHN0YXRpYyBNZW1v cnlDb250ZXh0IEFwcGx5TWVzc2FnZUNvbnRleHQgPSBOVUxMOwogTWVtb3J5Q29udGV4dCBBcHBs eUNvbnRleHQgPSBOVUxMOwogCkBAIC0yNjksMTIgKzI1NSw2IEBAIHN0YXRpYyBib29sIGluX3N0 cmVhbWVkX3RyYW5zYWN0aW9uID0gZmFsc2U7CiAKIHN0YXRpYyBUcmFuc2FjdGlvbklkIHN0cmVh bV94aWQgPSBJbnZhbGlkVHJhbnNhY3Rpb25JZDsKIAotLyoKLSAqIEhhc2ggdGFibGUgZm9yIHN0 b3JpbmcgdGhlIHN0cmVhbWluZyB4aWQgaW5mb3JtYXRpb24gYWxvbmcgd2l0aCBmaWxlc2V0cwot ICogZm9yIHN0cmVhbWluZyBhbmQgc3VieGFjdCBmaWxlcy4KLSAqLwotc3RhdGljIEhUQUIgKnhp ZGhhc2ggPSBOVUxMOwotCiAvKiBCdWZGaWxlIGhhbmRsZSBvZiB0aGUgY3VycmVudCBzdHJlYW1p bmcgZmlsZSAqLwogc3RhdGljIEJ1ZkZpbGUgKnN0cmVhbV9mZCA9IE5VTEw7CiAKQEAgLTExMTgs NyArMTA5OCw2IEBAIHN0YXRpYyB2b2lkCiBhcHBseV9oYW5kbGVfc3RyZWFtX3N0YXJ0KFN0cmlu Z0luZm8gcykKIHsKIAlib29sCQlmaXJzdF9zZWdtZW50OwotCUhBU0hDVEwJCWhhc2hfY3RsOwog CiAJaWYgKGluX3N0cmVhbWVkX3RyYW5zYWN0aW9uKQogCQllcmVwb3J0KEVSUk9SLApAQCAtMTE0 OCwxNyArMTEyNywyMyBAQCBhcHBseV9oYW5kbGVfc3RyZWFtX3N0YXJ0KFN0cmluZ0luZm8gcykK IAlzZXRfYXBwbHlfZXJyb3JfY29udGV4dF94YWN0KHN0cmVhbV94aWQsIDApOwogCiAJLyoKLQkg KiBJbml0aWFsaXplIHRoZSB4aWRoYXNoIHRhYmxlIGlmIHdlIGhhdmVuJ3QgeWV0LiBUaGlzIHdp bGwgYmUgdXNlZCBmb3IKLQkgKiB0aGUgZW50aXJlIGR1cmF0aW9uIG9mIHRoZSBhcHBseSB3b3Jr ZXIgc28gY3JlYXRlIGl0IGluIHBlcm1hbmVudAotCSAqIGNvbnRleHQuCisJICogSW5pdGlhbGl6 ZSB0aGUgd29ya2VyJ3Mgc3RyZWFtX2ZpbGVzZXQgaWYgd2UgaGF2ZW4ndCB5ZXQuIFRoaXMgd2ls bCBiZQorCSAqIHVzZWQgZm9yIHRoZSBlbnRpcmUgZHVyYXRpb24gb2YgdGhlIHdvcmtlciBzbyBj cmVhdGUgaXQgaW4gYSBwZXJtYW5lbnQKKwkgKiBjb250ZXh0LiBXZSBjcmVhdGUgdGhpcyBvbiB0 aGUgdmVyeSBmaXJzdCBzdHJlYW1pbmcgbWVzc2FnZSBmcm9tIGFueQorCSAqIHRyYW5zYWN0aW9u IGFuZCB0aGVuIHVzZSBpdCBmb3IgdGhpcyBhbmQgb3RoZXIgc3RyZWFtaW5nIHRyYW5zYWN0aW9u cy4KKwkgKiBOb3csIHdlIGNvdWxkIGNyZWF0ZSBhIGZpbGVzZXQgYXQgdGhlIHN0YXJ0IG9mIHRo ZSB3b3JrZXIgYXMgd2VsbCBidXQKKwkgKiB0aGVuIHdlIHdvbid0IGJlIHN1cmUgdGhhdCBpdCB3 aWxsIGV2ZXIgYmUgdXNlZC4KIAkgKi8KLQlpZiAoeGlkaGFzaCA9PSBOVUxMKQorCWlmIChNeUxv Z2ljYWxSZXBXb3JrZXItPnN0cmVhbV9maWxlc2V0ID09IE5VTEwpCiAJewotCQloYXNoX2N0bC5r ZXlzaXplID0gc2l6ZW9mKFRyYW5zYWN0aW9uSWQpOwotCQloYXNoX2N0bC5lbnRyeXNpemUgPSBz aXplb2YoU3RyZWFtWGlkSGFzaCk7Ci0JCWhhc2hfY3RsLmhjeHQgPSBBcHBseUNvbnRleHQ7Ci0J CXhpZGhhc2ggPSBoYXNoX2NyZWF0ZSgiU3RyZWFtWGlkSGFzaCIsIDEwMjQsICZoYXNoX2N0bCwK LQkJCQkJCQkgIEhBU0hfRUxFTSB8IEhBU0hfQkxPQlMgfCBIQVNIX0NPTlRFWFQpOworCQlNZW1v cnlDb250ZXh0IG9sZGN0eDsKKworCQlvbGRjdHggPSBNZW1vcnlDb250ZXh0U3dpdGNoVG8oQXBw bHlDb250ZXh0KTsKKworCQlNeUxvZ2ljYWxSZXBXb3JrZXItPnN0cmVhbV9maWxlc2V0ID0gcGFs bG9jKHNpemVvZihGaWxlU2V0KSk7CisJCUZpbGVTZXRJbml0KE15TG9naWNhbFJlcFdvcmtlci0+ c3RyZWFtX2ZpbGVzZXQpOworCisJCU1lbW9yeUNvbnRleHRTd2l0Y2hUbyhvbGRjdHgpOwogCX0K IAogCS8qIG9wZW4gdGhlIHNwb29sIGZpbGUgZm9yIHRoaXMgdHJhbnNhY3Rpb24gKi8KQEAgLTEy NTMsNyArMTIzOCw2IEBAIGFwcGx5X2hhbmRsZV9zdHJlYW1fYWJvcnQoU3RyaW5nSW5mbyBzKQog CQlCdWZGaWxlICAgICpmZDsKIAkJYm9vbAkJZm91bmQgPSBmYWxzZTsKIAkJY2hhcgkJcGF0aFtN QVhQR1BBVEhdOwotCQlTdHJlYW1YaWRIYXNoICplbnQ7CiAKIAkJc2V0X2FwcGx5X2Vycm9yX2Nv bnRleHRfeGFjdChzdWJ4aWQsIDApOwogCkBAIC0xMjg1LDE5ICsxMjY5LDEwIEBAIGFwcGx5X2hh bmRsZV9zdHJlYW1fYWJvcnQoU3RyaW5nSW5mbyBzKQogCQkJcmV0dXJuOwogCQl9CiAKLQkJZW50 ID0gKFN0cmVhbVhpZEhhc2ggKikgaGFzaF9zZWFyY2goeGlkaGFzaCwKLQkJCQkJCQkJCQkJKHZv aWQgKikgJnhpZCwKLQkJCQkJCQkJCQkJSEFTSF9GSU5ELAotCQkJCQkJCQkJCQlOVUxMKTsKLQkJ aWYgKCFlbnQpCi0JCQllcmVwb3J0KEVSUk9SLAotCQkJCQkoZXJyY29kZShFUlJDT0RFX1BST1RP Q09MX1ZJT0xBVElPTiksCi0JCQkJCSBlcnJtc2dfaW50ZXJuYWwoInRyYW5zYWN0aW9uICV1IG5v dCBmb3VuZCBpbiBzdHJlYW0gWElEIGhhc2ggdGFibGUiLAotCQkJCQkJCQkJIHhpZCkpKTsKLQog CQkvKiBvcGVuIHRoZSBjaGFuZ2VzIGZpbGUgKi8KIAkJY2hhbmdlc19maWxlbmFtZShwYXRoLCBN eUxvZ2ljYWxSZXBXb3JrZXItPnN1YmlkLCB4aWQpOwotCQlmZCA9IEJ1ZkZpbGVPcGVuRmlsZVNl dChlbnQtPnN0cmVhbV9maWxlc2V0LCBwYXRoLCBPX1JEV1IpOworCQlmZCA9IEJ1ZkZpbGVPcGVu RmlsZVNldChNeUxvZ2ljYWxSZXBXb3JrZXItPnN0cmVhbV9maWxlc2V0LCBwYXRoLAorCQkJCQkJ CQlPX1JEV1IsIGZhbHNlKTsKIAogCQkvKiBPSywgdHJ1bmNhdGUgdGhlIGZpbGUgYXQgdGhlIHJp Z2h0IG9mZnNldCAqLwogCQlCdWZGaWxlVHJ1bmNhdGVGaWxlU2V0KGZkLCBzdWJ4YWN0X2RhdGEu c3VieGFjdHNbc3ViaWR4XS5maWxlbm8sCkBAIC0xMzI3LDcgKzEzMDIsNiBAQCBhcHBseV9zcG9v bGVkX21lc3NhZ2VzKFRyYW5zYWN0aW9uSWQgeGlkLCBYTG9nUmVjUHRyIGxzbikKIAlpbnQJCQlu Y2hhbmdlczsKIAljaGFyCQlwYXRoW01BWFBHUEFUSF07CiAJY2hhcgkgICAqYnVmZmVyID0gTlVM TDsKLQlTdHJlYW1YaWRIYXNoICplbnQ7CiAJTWVtb3J5Q29udGV4dCBvbGRjeHQ7CiAJQnVmRmls ZSAgICAqZmQ7CiAKQEAgLTEzNDUsMTcgKzEzMTksOCBAQCBhcHBseV9zcG9vbGVkX21lc3NhZ2Vz KFRyYW5zYWN0aW9uSWQgeGlkLCBYTG9nUmVjUHRyIGxzbikKIAljaGFuZ2VzX2ZpbGVuYW1lKHBh dGgsIE15TG9naWNhbFJlcFdvcmtlci0+c3ViaWQsIHhpZCk7CiAJZWxvZyhERUJVRzEsICJyZXBs YXlpbmcgY2hhbmdlcyBmcm9tIGZpbGUgXCIlc1wiIiwgcGF0aCk7CiAKLQllbnQgPSAoU3RyZWFt WGlkSGFzaCAqKSBoYXNoX3NlYXJjaCh4aWRoYXNoLAotCQkJCQkJCQkJCSh2b2lkICopICZ4aWQs Ci0JCQkJCQkJCQkJSEFTSF9GSU5ELAotCQkJCQkJCQkJCU5VTEwpOwotCWlmICghZW50KQotCQll cmVwb3J0KEVSUk9SLAotCQkJCShlcnJjb2RlKEVSUkNPREVfUFJPVE9DT0xfVklPTEFUSU9OKSwK LQkJCQkgZXJybXNnX2ludGVybmFsKCJ0cmFuc2FjdGlvbiAldSBub3QgZm91bmQgaW4gc3RyZWFt IFhJRCBoYXNoIHRhYmxlIiwKLQkJCQkJCQkJIHhpZCkpKTsKLQotCWZkID0gQnVmRmlsZU9wZW5G aWxlU2V0KGVudC0+c3RyZWFtX2ZpbGVzZXQsIHBhdGgsIE9fUkRPTkxZKTsKKwlmZCA9IEJ1ZkZp bGVPcGVuRmlsZVNldChNeUxvZ2ljYWxSZXBXb3JrZXItPnN0cmVhbV9maWxlc2V0LCBwYXRoLCBP X1JET05MWSwKKwkJCQkJCQlmYWxzZSk7CiAKIAlidWZmZXIgPSBwYWxsb2MoQkxDS1NaKTsKIAlp bml0U3RyaW5nSW5mbygmczIpOwpAQCAtMjU0MiwzMCArMjUwNyw2IEBAIFVwZGF0ZVdvcmtlclN0 YXRzKFhMb2dSZWNQdHIgbGFzdF9sc24sIFRpbWVzdGFtcFR6IHNlbmRfdGltZSwgYm9vbCByZXBs eSkKIH0KIAogLyoKLSAqIENsZWFudXAgZmlsZXNldHMuCi0gKi8KLXZvaWQKLWxvZ2ljYWxyZXBf d29ya2VyX2NsZWFudXBmaWxlc2V0KHZvaWQpCi17Ci0JSEFTSF9TRVFfU1RBVFVTIHN0YXR1czsK LQlTdHJlYW1YaWRIYXNoICpoZW50cnk7Ci0KLQkvKiBSZW1vdmUgYWxsIHRoZSBwZW5kaW5nIHN0 cmVhbSBhbmQgc3VieGFjdCBmaWxlc2V0cy4gKi8KLQlpZiAoeGlkaGFzaCkKLQl7Ci0JCWhhc2hf c2VxX2luaXQoJnN0YXR1cywgeGlkaGFzaCk7Ci0JCXdoaWxlICgoaGVudHJ5ID0gKFN0cmVhbVhp ZEhhc2ggKikgaGFzaF9zZXFfc2VhcmNoKCZzdGF0dXMpKSAhPSBOVUxMKQotCQl7Ci0JCQlGaWxl U2V0RGVsZXRlQWxsKGhlbnRyeS0+c3RyZWFtX2ZpbGVzZXQpOwotCi0JCQkvKiBEZWxldGUgdGhl IHN1YnhhY3QgZmlsZXNldCBpZmYgaXQgaXMgY3JlYXRlZC4gKi8KLQkJCWlmIChoZW50cnktPnN1 YnhhY3RfZmlsZXNldCkKLQkJCQlGaWxlU2V0RGVsZXRlQWxsKGhlbnRyeS0+c3VieGFjdF9maWxl c2V0KTsKLQkJfQotCX0KLX0KLQotLyoKICAqIEFwcGx5IG1haW4gbG9vcC4KICAqLwogc3RhdGlj IHZvaWQKQEAgLTMwMjYsNTggKzI5NjcsMzAgQEAgc3VieGFjdF9pbmZvX3dyaXRlKE9pZCBzdWJp ZCwgVHJhbnNhY3Rpb25JZCB4aWQpCiB7CiAJY2hhcgkJcGF0aFtNQVhQR1BBVEhdOwogCVNpemUJ CWxlbjsKLQlTdHJlYW1YaWRIYXNoICplbnQ7CiAJQnVmRmlsZSAgICAqZmQ7CiAKIAlBc3NlcnQo VHJhbnNhY3Rpb25JZElzVmFsaWQoeGlkKSk7CiAKLQkvKiBGaW5kIHRoZSB4aWQgZW50cnkgaW4g dGhlIHhpZGhhc2ggKi8KLQllbnQgPSAoU3RyZWFtWGlkSGFzaCAqKSBoYXNoX3NlYXJjaCh4aWRo YXNoLAotCQkJCQkJCQkJCSh2b2lkICopICZ4aWQsCi0JCQkJCQkJCQkJSEFTSF9GSU5ELAotCQkJ CQkJCQkJCU5VTEwpOwotCS8qIEJ5IHRoaXMgdGltZSB3ZSBtdXN0IGhhdmUgY3JlYXRlZCB0aGUg dHJhbnNhY3Rpb24gZW50cnkgKi8KLQlBc3NlcnQoZW50KTsKKwkvKiBjb25zdHJ1Y3QgdGhlIHN1 YnhhY3QgZmlsZW5hbWUgKi8KKwlzdWJ4YWN0X2ZpbGVuYW1lKHBhdGgsIHN1YmlkLCB4aWQpOwog Ci0JLyoKLQkgKiBJZiB0aGVyZSBpcyBubyBzdWJ0cmFuc2FjdGlvbiB0aGVuIG5vdGhpbmcgdG8g ZG8sIGJ1dCBpZiBhbHJlYWR5IGhhdmUKLQkgKiBzdWJ4YWN0IGZpbGUgdGhlbiBkZWxldGUgdGhh dC4KLQkgKi8KKwkvKiBEZWxldGUgdGhlIHN1YnhhY3RzIGZpbGUsIGlmIGV4aXN0cy4gKi8KIAlp ZiAoc3VieGFjdF9kYXRhLm5zdWJ4YWN0cyA9PSAwKQogCXsKLQkJaWYgKGVudC0+c3VieGFjdF9m aWxlc2V0KQotCQl7Ci0JCQljbGVhbnVwX3N1YnhhY3RfaW5mbygpOwotCQkJRmlsZVNldERlbGV0 ZUFsbChlbnQtPnN1YnhhY3RfZmlsZXNldCk7Ci0JCQlwZnJlZShlbnQtPnN1YnhhY3RfZmlsZXNl dCk7Ci0JCQllbnQtPnN1YnhhY3RfZmlsZXNldCA9IE5VTEw7Ci0JCX0KKwkJY2xlYW51cF9zdWJ4 YWN0X2luZm8oKTsKKwkJQnVmRmlsZURlbGV0ZUZpbGVTZXQoTXlMb2dpY2FsUmVwV29ya2VyLT5z dHJlYW1fZmlsZXNldCwgcGF0aCwgdHJ1ZSk7CisKIAkJcmV0dXJuOwogCX0KIAotCXN1YnhhY3Rf ZmlsZW5hbWUocGF0aCwgc3ViaWQsIHhpZCk7Ci0KIAkvKgogCSAqIENyZWF0ZSB0aGUgc3VieGFj dCBmaWxlIGlmIGl0IG5vdCBhbHJlYWR5IGNyZWF0ZWQsIG90aGVyd2lzZSBvcGVuIHRoZQogCSAq IGV4aXN0aW5nIGZpbGUuCiAJICovCi0JaWYgKGVudC0+c3VieGFjdF9maWxlc2V0ID09IE5VTEwp Ci0JewotCQlNZW1vcnlDb250ZXh0IG9sZGN0eDsKLQotCQkvKgotCQkgKiBXZSBuZWVkIHRvIG1h aW50YWluIGZpbGVzZXQgYWNyb3NzIG11bHRpcGxlIHN0cmVhbSBzdGFydC9zdG9wCi0JCSAqIGNh bGxzLiBTbywgbmVlZCB0byBhbGxvY2F0ZSBpdCBpbiBhIHBlcnNpc3RlbnQgY29udGV4dC4KLQkJ ICovCi0JCW9sZGN0eCA9IE1lbW9yeUNvbnRleHRTd2l0Y2hUbyhBcHBseUNvbnRleHQpOwotCQll bnQtPnN1YnhhY3RfZmlsZXNldCA9IHBhbGxvYyhzaXplb2YoRmlsZVNldCkpOwotCQlGaWxlU2V0 SW5pdChlbnQtPnN1YnhhY3RfZmlsZXNldCk7Ci0JCU1lbW9yeUNvbnRleHRTd2l0Y2hUbyhvbGRj dHgpOwotCi0JCWZkID0gQnVmRmlsZUNyZWF0ZUZpbGVTZXQoZW50LT5zdWJ4YWN0X2ZpbGVzZXQs IHBhdGgpOwotCX0KLQllbHNlCi0JCWZkID0gQnVmRmlsZU9wZW5GaWxlU2V0KGVudC0+c3VieGFj dF9maWxlc2V0LCBwYXRoLCBPX1JEV1IpOworCWZkID0gQnVmRmlsZU9wZW5GaWxlU2V0KE15TG9n aWNhbFJlcFdvcmtlci0+c3RyZWFtX2ZpbGVzZXQsIHBhdGgsIE9fUkRXUiwKKwkJCQkJCQl0cnVl KTsKKwlpZiAoZmQgPT0gTlVMTCkKKwkJZmQgPSBCdWZGaWxlQ3JlYXRlRmlsZVNldChNeUxvZ2lj YWxSZXBXb3JrZXItPnN0cmVhbV9maWxlc2V0LCBwYXRoKTsKIAogCWxlbiA9IHNpemVvZihTdWJY YWN0SW5mbykgKiBzdWJ4YWN0X2RhdGEubnN1YnhhY3RzOwogCkBAIC0zMTA0LDM0ICszMDE3LDIx IEBAIHN1YnhhY3RfaW5mb19yZWFkKE9pZCBzdWJpZCwgVHJhbnNhY3Rpb25JZCB4aWQpCiAJY2hh cgkJcGF0aFtNQVhQR1BBVEhdOwogCVNpemUJCWxlbjsKIAlCdWZGaWxlICAgICpmZDsKLQlTdHJl YW1YaWRIYXNoICplbnQ7CiAJTWVtb3J5Q29udGV4dCBvbGRjdHg7CiAKIAlBc3NlcnQoIXN1Ynhh Y3RfZGF0YS5zdWJ4YWN0cyk7CiAJQXNzZXJ0KHN1YnhhY3RfZGF0YS5uc3VieGFjdHMgPT0gMCk7 CiAJQXNzZXJ0KHN1YnhhY3RfZGF0YS5uc3VieGFjdHNfbWF4ID09IDApOwogCi0JLyogRmluZCB0 aGUgc3RyZWFtIHhpZCBlbnRyeSBpbiB0aGUgeGlkaGFzaCAqLwotCWVudCA9IChTdHJlYW1YaWRI YXNoICopIGhhc2hfc2VhcmNoKHhpZGhhc2gsCi0JCQkJCQkJCQkJKHZvaWQgKikgJnhpZCwKLQkJ CQkJCQkJCQlIQVNIX0ZJTkQsCi0JCQkJCQkJCQkJTlVMTCk7Ci0JaWYgKCFlbnQpCi0JCWVyZXBv cnQoRVJST1IsCi0JCQkJKGVycmNvZGUoRVJSQ09ERV9QUk9UT0NPTF9WSU9MQVRJT04pLAotCQkJ CSBlcnJtc2dfaW50ZXJuYWwoInRyYW5zYWN0aW9uICV1IG5vdCBmb3VuZCBpbiBzdHJlYW0gWElE IGhhc2ggdGFibGUiLAotCQkJCQkJCQkgeGlkKSkpOwotCiAJLyoKLQkgKiBJZiBzdWJ4YWN0X2Zp bGVzZXQgaXMgbm90IHZhbGlkIHRoYXQgbWVhbiB3ZSBkb24ndCBoYXZlIGFueSBzdWJ4YWN0Ci0J ICogaW5mbworCSAqIElmIHRoZSBzdWJ4YWN0IGZpbGUgZG9lc24ndCBleGlzdCB0aGF0IG1lYW5z IHdlIGRvbid0IGhhdmUgYW55IHN1YnhhY3QKKwkgKiBpbmZvLgogCSAqLwotCWlmIChlbnQtPnN1 YnhhY3RfZmlsZXNldCA9PSBOVUxMKQotCQlyZXR1cm47Ci0KIAlzdWJ4YWN0X2ZpbGVuYW1lKHBh dGgsIHN1YmlkLCB4aWQpOwotCi0JZmQgPSBCdWZGaWxlT3BlbkZpbGVTZXQoZW50LT5zdWJ4YWN0 X2ZpbGVzZXQsIHBhdGgsIE9fUkRPTkxZKTsKKwlmZCA9IEJ1ZkZpbGVPcGVuRmlsZVNldChNeUxv Z2ljYWxSZXBXb3JrZXItPnN0cmVhbV9maWxlc2V0LCBwYXRoLCBPX1JET05MWSwKKwkJCQkJCQl0 cnVlKTsKKwlpZiAoZmQgPT0gTlVMTCkKKwkJcmV0dXJuOwogCiAJLyogcmVhZCBudW1iZXIgb2Yg c3VieGFjdCBpdGVtcyAqLwogCWlmIChCdWZGaWxlUmVhZChmZCwgJnN1YnhhY3RfZGF0YS5uc3Vi eGFjdHMsCkBAIC0zMjY3LDQyICszMTY3LDIxIEBAIGNoYW5nZXNfZmlsZW5hbWUoY2hhciAqcGF0 aCwgT2lkIHN1YmlkLCBUcmFuc2FjdGlvbklkIHhpZCkKICAqCSAgQ2xlYW51cCBmaWxlcyBmb3Ig YSBzdWJzY3JpcHRpb24gLyB0b3BsZXZlbCB0cmFuc2FjdGlvbi4KICAqCiAgKiBSZW1vdmUgZmls ZXMgd2l0aCBzZXJpYWxpemVkIGNoYW5nZXMgYW5kIHN1YnhhY3QgaW5mbyBmb3IgYSBwYXJ0aWN1 bGFyCi0gKiB0b3BsZXZlbCB0cmFuc2FjdGlvbi4gRWFjaCBzdWJzY3JpcHRpb24gaGFzIGEgc2Vw YXJhdGUgc2V0IG9mIGZpbGVzLgorICogdG9wbGV2ZWwgdHJhbnNhY3Rpb24uIEVhY2ggc3Vic2Ny aXB0aW9uIGhhcyBhIHNlcGFyYXRlIHNldCBvZiBmaWxlcworICogZm9yIGFueSB0b3BsZXZlbCB0 cmFuc2FjdGlvbi4KICAqLwogc3RhdGljIHZvaWQKIHN0cmVhbV9jbGVhbnVwX2ZpbGVzKE9pZCBz dWJpZCwgVHJhbnNhY3Rpb25JZCB4aWQpCiB7CiAJY2hhcgkJcGF0aFtNQVhQR1BBVEhdOwotCVN0 cmVhbVhpZEhhc2ggKmVudDsKLQotCS8qIEZpbmQgdGhlIHhpZCBlbnRyeSBpbiB0aGUgeGlkaGFz aCAqLwotCWVudCA9IChTdHJlYW1YaWRIYXNoICopIGhhc2hfc2VhcmNoKHhpZGhhc2gsCi0JCQkJ CQkJCQkJKHZvaWQgKikgJnhpZCwKLQkJCQkJCQkJCQlIQVNIX0ZJTkQsCi0JCQkJCQkJCQkJTlVM TCk7Ci0JaWYgKCFlbnQpCi0JCWVyZXBvcnQoRVJST1IsCi0JCQkJKGVycmNvZGUoRVJSQ09ERV9Q Uk9UT0NPTF9WSU9MQVRJT04pLAotCQkJCSBlcnJtc2dfaW50ZXJuYWwoInRyYW5zYWN0aW9uICV1 IG5vdCBmb3VuZCBpbiBzdHJlYW0gWElEIGhhc2ggdGFibGUiLAotCQkJCQkJCQkgeGlkKSkpOwog Ci0JLyogRGVsZXRlIHRoZSBjaGFuZ2UgZmlsZSBhbmQgcmVsZWFzZSB0aGUgc3RyZWFtIGZpbGVz ZXQgbWVtb3J5ICovCisJLyogRGVsZXRlIHRoZSBjaGFuZ2VzIGZpbGUuICovCiAJY2hhbmdlc19m aWxlbmFtZShwYXRoLCBzdWJpZCwgeGlkKTsKLQlGaWxlU2V0RGVsZXRlQWxsKGVudC0+c3RyZWFt X2ZpbGVzZXQpOwotCXBmcmVlKGVudC0+c3RyZWFtX2ZpbGVzZXQpOwotCWVudC0+c3RyZWFtX2Zp bGVzZXQgPSBOVUxMOworCUJ1ZkZpbGVEZWxldGVGaWxlU2V0KE15TG9naWNhbFJlcFdvcmtlci0+ c3RyZWFtX2ZpbGVzZXQsIHBhdGgsIGZhbHNlKTsKIAotCS8qIERlbGV0ZSB0aGUgc3VieGFjdCBm aWxlIGFuZCByZWxlYXNlIHRoZSBtZW1vcnksIGlmIGl0IGV4aXN0ICovCi0JaWYgKGVudC0+c3Vi eGFjdF9maWxlc2V0KQotCXsKLQkJc3VieGFjdF9maWxlbmFtZShwYXRoLCBzdWJpZCwgeGlkKTsK LQkJRmlsZVNldERlbGV0ZUFsbChlbnQtPnN1YnhhY3RfZmlsZXNldCk7Ci0JCXBmcmVlKGVudC0+ c3VieGFjdF9maWxlc2V0KTsKLQkJZW50LT5zdWJ4YWN0X2ZpbGVzZXQgPSBOVUxMOwotCX0KLQot CS8qIFJlbW92ZSB0aGUgeGlkIGVudHJ5IGZyb20gdGhlIHN0cmVhbSB4aWQgaGFzaCAqLwotCWhh c2hfc2VhcmNoKHhpZGhhc2gsICh2b2lkICopICZ4aWQsIEhBU0hfUkVNT1ZFLCBOVUxMKTsKKwkv KiBEZWxldGUgdGhlIHN1YnhhY3QgZmlsZSwgaWYgaXQgZXhpc3RzLiAqLworCXN1YnhhY3RfZmls ZW5hbWUocGF0aCwgc3ViaWQsIHhpZCk7CisJQnVmRmlsZURlbGV0ZUZpbGVTZXQoTXlMb2dpY2Fs UmVwV29ya2VyLT5zdHJlYW1fZmlsZXNldCwgcGF0aCwgdHJ1ZSk7CiB9CiAKIC8qCkBAIC0zMzEy LDggKzMxOTEsOCBAQCBzdHJlYW1fY2xlYW51cF9maWxlcyhPaWQgc3ViaWQsIFRyYW5zYWN0aW9u SWQgeGlkKQogICoKICAqIE9wZW4gYSBmaWxlIGZvciBzdHJlYW1lZCBjaGFuZ2VzIGZyb20gYSB0 b3BsZXZlbCB0cmFuc2FjdGlvbiBpZGVudGlmaWVkCiAgKiBieSBzdHJlYW1feGlkIChnbG9iYWwg dmFyaWFibGUpLiBJZiBpdCdzIHRoZSBmaXJzdCBjaHVuayBvZiBzdHJlYW1lZAotICogY2hhbmdl cyBmb3IgdGhpcyB0cmFuc2FjdGlvbiwgaW5pdGlhbGl6ZSB0aGUgZmlsZXNldCBhbmQgY3JlYXRl IHRoZSBidWZmaWxlLAotICogb3RoZXJ3aXNlIG9wZW4gdGhlIHByZXZpb3VzbHkgY3JlYXRlZCBm aWxlLgorICogY2hhbmdlcyBmb3IgdGhpcyB0cmFuc2FjdGlvbiwgY3JlYXRlIHRoZSBidWZmaWxl LCBvdGhlcndpc2Ugb3BlbiB0aGUKKyAqIHByZXZpb3VzbHkgY3JlYXRlZCBmaWxlLgogICoKICAq IFRoaXMgY2FuIG9ubHkgYmUgY2FsbGVkIGF0IHRoZSBiZWdpbm5pbmcgb2YgYSAic3RyZWFtaW5n IiBibG9jaywgaS5lLgogICogYmV0d2VlbiBzdHJlYW1fc3RhcnQvc3RyZWFtX3N0b3AgbWVzc2Fn ZXMgZnJvbSB0aGUgdXBzdHJlYW0uCkBAIC0zMzIyLDIwICszMjAxLDEzIEBAIHN0YXRpYyB2b2lk CiBzdHJlYW1fb3Blbl9maWxlKE9pZCBzdWJpZCwgVHJhbnNhY3Rpb25JZCB4aWQsIGJvb2wgZmly c3Rfc2VnbWVudCkKIHsKIAljaGFyCQlwYXRoW01BWFBHUEFUSF07Ci0JYm9vbAkJZm91bmQ7CiAJ TWVtb3J5Q29udGV4dCBvbGRjeHQ7Ci0JU3RyZWFtWGlkSGFzaCAqZW50OwogCiAJQXNzZXJ0KGlu X3N0cmVhbWVkX3RyYW5zYWN0aW9uKTsKIAlBc3NlcnQoT2lkSXNWYWxpZChzdWJpZCkpOwogCUFz c2VydChUcmFuc2FjdGlvbklkSXNWYWxpZCh4aWQpKTsKIAlBc3NlcnQoc3RyZWFtX2ZkID09IE5V TEwpOwogCi0JLyogY3JlYXRlIG9yIGZpbmQgdGhlIHhpZCBlbnRyeSBpbiB0aGUgeGlkaGFzaCAq LwotCWVudCA9IChTdHJlYW1YaWRIYXNoICopIGhhc2hfc2VhcmNoKHhpZGhhc2gsCi0JCQkJCQkJ CQkJKHZvaWQgKikgJnhpZCwKLQkJCQkJCQkJCQlIQVNIX0VOVEVSLAotCQkJCQkJCQkJCSZmb3Vu ZCk7CiAKIAljaGFuZ2VzX2ZpbGVuYW1lKHBhdGgsIHN1YmlkLCB4aWQpOwogCWVsb2coREVCVUcx LCAib3BlbmluZyBmaWxlIFwiJXNcIiBmb3Igc3RyZWFtZWQgY2hhbmdlcyIsIHBhdGgpOwpAQCAt MzM0Nyw0OSArMzIxOSwyMCBAQCBzdHJlYW1fb3Blbl9maWxlKE9pZCBzdWJpZCwgVHJhbnNhY3Rp b25JZCB4aWQsIGJvb2wgZmlyc3Rfc2VnbWVudCkKIAlvbGRjeHQgPSBNZW1vcnlDb250ZXh0U3dp dGNoVG8oTG9naWNhbFN0cmVhbWluZ0NvbnRleHQpOwogCiAJLyoKLQkgKiBJZiB0aGlzIGlzIHRo ZSBmaXJzdCBzdHJlYW1lZCBzZWdtZW50LCB0aGUgZmlsZSBtdXN0IG5vdCBleGlzdCwgc28gbWFr ZQotCSAqIHN1cmUgd2UncmUgdGhlIG9uZXMgY3JlYXRpbmcgaXQuIE90aGVyd2lzZSBqdXN0IG9w ZW4gdGhlIGZpbGUgZm9yCi0JICogd3JpdGluZywgaW4gYXBwZW5kIG1vZGUuCisJICogSWYgdGhp cyBpcyB0aGUgZmlyc3Qgc3RyZWFtZWQgc2VnbWVudCwgY3JlYXRlIHRoZSBjaGFuZ2VzIGZpbGUu CisJICogT3RoZXJ3aXNlLCBqdXN0IG9wZW4gdGhlIGZpbGUgZm9yIHdyaXRpbmcsIGluIGFwcGVu ZCBtb2RlLgogCSAqLwogCWlmIChmaXJzdF9zZWdtZW50KQotCXsKLQkJTWVtb3J5Q29udGV4dCBz YXZlY3R4OwotCQlGaWxlU2V0ICAgICpmaWxlc2V0OwotCi0JCWlmIChmb3VuZCkKLQkJCWVyZXBv cnQoRVJST1IsCi0JCQkJCShlcnJjb2RlKEVSUkNPREVfUFJPVE9DT0xfVklPTEFUSU9OKSwKLQkJ CQkJIGVycm1zZ19pbnRlcm5hbCgiaW5jb3JyZWN0IGZpcnN0LXNlZ21lbnQgZmxhZyBmb3Igc3Ry ZWFtZWQgcmVwbGljYXRpb24gdHJhbnNhY3Rpb24iKSkpOwotCi0JCS8qCi0JCSAqIFdlIG5lZWQg dG8gbWFpbnRhaW4gZmlsZXNldCBhY3Jvc3MgbXVsdGlwbGUgc3RyZWFtIHN0YXJ0L3N0b3AKLQkJ ICogY2FsbHMuIFNvLCBuZWVkIHRvIGFsbG9jYXRlIGl0IGluIGEgcGVyc2lzdGVudCBjb250ZXh0 LgotCQkgKi8KLQkJc2F2ZWN0eCA9IE1lbW9yeUNvbnRleHRTd2l0Y2hUbyhBcHBseUNvbnRleHQp OwotCQlmaWxlc2V0ID0gcGFsbG9jKHNpemVvZihGaWxlU2V0KSk7Ci0KLQkJRmlsZVNldEluaXQo ZmlsZXNldCk7Ci0JCU1lbW9yeUNvbnRleHRTd2l0Y2hUbyhzYXZlY3R4KTsKLQotCQlzdHJlYW1f ZmQgPSBCdWZGaWxlQ3JlYXRlRmlsZVNldChmaWxlc2V0LCBwYXRoKTsKLQotCQkvKiBSZW1lbWJl ciB0aGUgZmlsZXNldCBmb3IgdGhlIG5leHQgc3RyZWFtIG9mIHRoZSBzYW1lIHRyYW5zYWN0aW9u ICovCi0JCWVudC0+eGlkID0geGlkOwotCQllbnQtPnN0cmVhbV9maWxlc2V0ID0gZmlsZXNldDsK LQkJZW50LT5zdWJ4YWN0X2ZpbGVzZXQgPSBOVUxMOwotCX0KKwkJc3RyZWFtX2ZkID0gQnVmRmls ZUNyZWF0ZUZpbGVTZXQoTXlMb2dpY2FsUmVwV29ya2VyLT5zdHJlYW1fZmlsZXNldCwKKwkJCQkJ CQkJCQkgcGF0aCk7CiAJZWxzZQogCXsKLQkJaWYgKCFmb3VuZCkKLQkJCWVyZXBvcnQoRVJST1Is Ci0JCQkJCShlcnJjb2RlKEVSUkNPREVfUFJPVE9DT0xfVklPTEFUSU9OKSwKLQkJCQkJIGVycm1z Z19pbnRlcm5hbCgiaW5jb3JyZWN0IGZpcnN0LXNlZ21lbnQgZmxhZyBmb3Igc3RyZWFtZWQgcmVw bGljYXRpb24gdHJhbnNhY3Rpb24iKSkpOwotCiAJCS8qCiAJCSAqIE9wZW4gdGhlIGZpbGUgYW5k IHNlZWsgdG8gdGhlIGVuZCBvZiB0aGUgZmlsZSBiZWNhdXNlIHdlIGFsd2F5cwogCQkgKiBhcHBl bmQgdGhlIGNoYW5nZXMgZmlsZS4KIAkJICovCi0JCXN0cmVhbV9mZCA9IEJ1ZkZpbGVPcGVuRmls ZVNldChlbnQtPnN0cmVhbV9maWxlc2V0LCBwYXRoLCBPX1JEV1IpOworCQlzdHJlYW1fZmQgPSBC dWZGaWxlT3BlbkZpbGVTZXQoTXlMb2dpY2FsUmVwV29ya2VyLT5zdHJlYW1fZmlsZXNldCwKKwkJ CQkJCQkJCSAgIHBhdGgsIE9fUkRXUiwgZmFsc2UpOwogCQlCdWZGaWxlU2VlayhzdHJlYW1fZmQs IDAsIDAsIFNFRUtfRU5EKTsKIAl9CiAKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3N0b3JhZ2Uv ZmlsZS9idWZmaWxlLmMgYi9zcmMvYmFja2VuZC9zdG9yYWdlL2ZpbGUvYnVmZmlsZS5jCmluZGV4 IDVlNTQwOWQuLmZmM2FhNjcgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3N0b3JhZ2UvZmlsZS9i dWZmaWxlLmMKKysrIGIvc3JjL2JhY2tlbmQvc3RvcmFnZS9maWxlL2J1ZmZpbGUuYwpAQCAtMjc4 LDEwICsyNzgsMTMgQEAgQnVmRmlsZUNyZWF0ZUZpbGVTZXQoRmlsZVNldCAqZmlsZXNldCwgY29u c3QgY2hhciAqbmFtZSkKICAqIHdpdGggQnVmRmlsZUNyZWF0ZUZpbGVTZXQgaW4gdGhlIHNhbWUg RmlsZVNldCB1c2luZyB0aGUgc2FtZSBuYW1lLgogICogVGhlIGJhY2tlbmQgdGhhdCBjcmVhdGVk IHRoZSBmaWxlIG11c3QgaGF2ZSBjYWxsZWQgQnVmRmlsZUNsb3NlKCkgb3IKICAqIEJ1ZkZpbGVF eHBvcnRGaWxlU2V0KCkgdG8gbWFrZSBzdXJlIHRoYXQgaXQgaXMgcmVhZHkgdG8gYmUgb3BlbmVk IGJ5IG90aGVyCi0gKiBiYWNrZW5kcyBhbmQgcmVuZGVyIGl0IHJlYWQtb25seS4KKyAqIGJhY2tl bmRzIGFuZCByZW5kZXIgaXQgcmVhZC1vbmx5LiAgSWYgbWlzc2luZ19vayBpcyB0cnVlLCB3aGlj aCBpbmRpY2F0ZXMKKyAqIHRoYXQgbWlzc2luZyBmaWxlcyBjYW4gYmUgc2FmZWx5IGlnbm9yZWQs IHRoZW4gcmV0dXJuIE5VTEwgaWYgdGhlIEJ1ZkZpbGUKKyAqIHdpdGggdGhlIGdpdmVuIG5hbWUg aXMgbm90IGZvdW5kLCBvdGhlcndpc2UsIHRocm93IGFuIGVycm9yLgogICovCiBCdWZGaWxlICoK LUJ1ZkZpbGVPcGVuRmlsZVNldChGaWxlU2V0ICpmaWxlc2V0LCBjb25zdCBjaGFyICpuYW1lLCBp bnQgbW9kZSkKK0J1ZkZpbGVPcGVuRmlsZVNldChGaWxlU2V0ICpmaWxlc2V0LCBjb25zdCBjaGFy ICpuYW1lLCBpbnQgbW9kZSwKKwkJCQkgICBib29sIG1pc3Npbmdfb2spCiB7CiAJQnVmRmlsZSAg ICAqZmlsZTsKIAljaGFyCQlzZWdtZW50X25hbWVbTUFYUEdQQVRIXTsKQEAgLTMxOCwxMCArMzIx LDE4IEBAIEJ1ZkZpbGVPcGVuRmlsZVNldChGaWxlU2V0ICpmaWxlc2V0LCBjb25zdCBjaGFyICpu YW1lLCBpbnQgbW9kZSkKIAkgKiBuYW1lLgogCSAqLwogCWlmIChuZmlsZXMgPT0gMCkKKwl7CisJ CS8qIGZyZWUgdGhlIG1lbW9yeSAqLworCQlwZnJlZShmaWxlcyk7CisKKwkJaWYgKG1pc3Npbmdf b2spCisJCQlyZXR1cm4gTlVMTDsKKwogCQllcmVwb3J0KEVSUk9SLAogCQkJCShlcnJjb2RlX2Zv cl9maWxlX2FjY2VzcygpLAogCQkJCSBlcnJtc2coImNvdWxkIG5vdCBvcGVuIHRlbXBvcmFyeSBm aWxlIFwiJXNcIiBmcm9tIEJ1ZkZpbGUgXCIlc1wiOiAlbSIsCiAJCQkJCQlzZWdtZW50X25hbWUs IG5hbWUpKSk7CisJfQogCiAJZmlsZSA9IG1ha2VCdWZGaWxlQ29tbW9uKG5maWxlcyk7CiAJZmls ZS0+ZmlsZXMgPSBmaWxlczsKQEAgLTM0MSwxMCArMzUyLDExIEBAIEJ1ZkZpbGVPcGVuRmlsZVNl dChGaWxlU2V0ICpmaWxlc2V0LCBjb25zdCBjaGFyICpuYW1lLCBpbnQgbW9kZSkKICAqIHRoZSBG aWxlU2V0IHRvIGJlIGNsZWFuZWQgdXAuCiAgKgogICogT25seSBvbmUgYmFja2VuZCBzaG91bGQg YXR0ZW1wdCB0byBkZWxldGUgYSBnaXZlbiBuYW1lLCBhbmQgc2hvdWxkIGtub3cKLSAqIHRoYXQg aXQgZXhpc3RzIGFuZCBoYXMgYmVlbiBleHBvcnRlZCBvciBjbG9zZWQuCisgKiB0aGF0IGl0IGV4 aXN0cyBhbmQgaGFzIGJlZW4gZXhwb3J0ZWQgb3IgY2xvc2VkIG90aGVyd2lzZSBtaXNzaW5nX29r IHNob3VsZAorICogYmUgcGFzc2VkIHRydWUuCiAgKi8KIHZvaWQKLUJ1ZkZpbGVEZWxldGVGaWxl U2V0KEZpbGVTZXQgKmZpbGVzZXQsIGNvbnN0IGNoYXIgKm5hbWUpCitCdWZGaWxlRGVsZXRlRmls ZVNldChGaWxlU2V0ICpmaWxlc2V0LCBjb25zdCBjaGFyICpuYW1lLCBib29sIG1pc3Npbmdfb2sp CiB7CiAJY2hhcgkJc2VnbWVudF9uYW1lW01BWFBHUEFUSF07CiAJaW50CQkJc2VnbWVudCA9IDA7 CkBAIC0zNjYsNyArMzc4LDcgQEAgQnVmRmlsZURlbGV0ZUZpbGVTZXQoRmlsZVNldCAqZmlsZXNl dCwgY29uc3QgY2hhciAqbmFtZSkKIAkJQ0hFQ0tfRk9SX0lOVEVSUlVQVFMoKTsKIAl9CiAKLQlp ZiAoIWZvdW5kKQorCWlmICghZm91bmQgJiYgIW1pc3Npbmdfb2spCiAJCWVsb2coRVJST1IsICJj b3VsZCBub3QgZGVsZXRlIHVua25vd24gQnVmRmlsZSBcIiVzXCIiLCBuYW1lKTsKIH0KIApkaWZm IC0tZ2l0IGEvc3JjL2JhY2tlbmQvdXRpbHMvc29ydC9sb2d0YXBlLmMgYi9zcmMvYmFja2VuZC91 dGlscy9zb3J0L2xvZ3RhcGUuYwppbmRleCBmNzk5NGQ3Li5kZWJmMTJlMSAxMDA2NDQKLS0tIGEv c3JjL2JhY2tlbmQvdXRpbHMvc29ydC9sb2d0YXBlLmMKKysrIGIvc3JjL2JhY2tlbmQvdXRpbHMv c29ydC9sb2d0YXBlLmMKQEAgLTU2NCw3ICs1NjQsNyBAQCBsdHNDb25jYXRXb3JrZXJUYXBlcyhM b2dpY2FsVGFwZVNldCAqbHRzLCBUYXBlU2hhcmUgKnNoYXJlZCwKIAkJbHQgPSAmbHRzLT50YXBl c1tpXTsKIAogCQlwZ19pdG9hKGksIGZpbGVuYW1lKTsKLQkJZmlsZSA9IEJ1ZkZpbGVPcGVuRmls ZVNldCgmZmlsZXNldC0+ZnMsIGZpbGVuYW1lLCBPX1JET05MWSk7CisJCWZpbGUgPSBCdWZGaWxl T3BlbkZpbGVTZXQoJmZpbGVzZXQtPmZzLCBmaWxlbmFtZSwgT19SRE9OTFksIGZhbHNlKTsKIAkJ ZmlsZXNpemUgPSBCdWZGaWxlU2l6ZShmaWxlKTsKIAogCQkvKgpkaWZmIC0tZ2l0IGEvc3JjL2Jh Y2tlbmQvdXRpbHMvc29ydC9zaGFyZWR0dXBsZXN0b3JlLmMgYi9zcmMvYmFja2VuZC91dGlscy9z b3J0L3NoYXJlZHR1cGxlc3RvcmUuYwppbmRleCA1MDRlZjFjLi4wMzMwODhmIDEwMDY0NAotLS0g YS9zcmMvYmFja2VuZC91dGlscy9zb3J0L3NoYXJlZHR1cGxlc3RvcmUuYworKysgYi9zcmMvYmFj a2VuZC91dGlscy9zb3J0L3NoYXJlZHR1cGxlc3RvcmUuYwpAQCAtNTYwLDcgKzU2MCw4IEBAIHN0 c19wYXJhbGxlbF9zY2FuX25leHQoU2hhcmVkVHVwbGVzdG9yZUFjY2Vzc29yICphY2Nlc3Nvciwg dm9pZCAqbWV0YV9kYXRhKQogCiAJCQkJc3RzX2ZpbGVuYW1lKG5hbWUsIGFjY2Vzc29yLCBhY2Nl c3Nvci0+cmVhZF9wYXJ0aWNpcGFudCk7CiAJCQkJYWNjZXNzb3ItPnJlYWRfZmlsZSA9Ci0JCQkJ CUJ1ZkZpbGVPcGVuRmlsZVNldCgmYWNjZXNzb3ItPmZpbGVzZXQtPmZzLCBuYW1lLCBPX1JET05M WSk7CisJCQkJCUJ1ZkZpbGVPcGVuRmlsZVNldCgmYWNjZXNzb3ItPmZpbGVzZXQtPmZzLCBuYW1l LCBPX1JET05MWSwKKwkJCQkJCQkJCSAgIGZhbHNlKTsKIAkJCX0KIAogCQkJLyogU2VlayBhbmQg bG9hZCB0aGUgY2h1bmsgaGVhZGVyLiAqLwpkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvcmVwbGlj YXRpb24vd29ya2VyX2ludGVybmFsLmggYi9zcmMvaW5jbHVkZS9yZXBsaWNhdGlvbi93b3JrZXJf aW50ZXJuYWwuaAppbmRleCBhNmM5ZDRlLi5jMDBiZTJhIDEwMDY0NAotLS0gYS9zcmMvaW5jbHVk ZS9yZXBsaWNhdGlvbi93b3JrZXJfaW50ZXJuYWwuaAorKysgYi9zcmMvaW5jbHVkZS9yZXBsaWNh dGlvbi93b3JrZXJfaW50ZXJuYWwuaApAQCAtNTAsNiArNTAsMTUgQEAgdHlwZWRlZiBzdHJ1Y3Qg TG9naWNhbFJlcFdvcmtlcgogCVhMb2dSZWNQdHIJcmVsc3RhdGVfbHNuOwogCXNsb2NrX3QJCXJl bG11dGV4OwogCisJLyoKKwkgKiBVc2VkIHRvIGNyZWF0ZSB0aGUgY2hhbmdlcyBhbmQgc3VieGFj dCBmaWxlcyBmb3IgdGhlIHN0cmVhbWluZworCSAqIHRyYW5zYWN0aW9ucy4gIFVwb24gdGhlIGFy cml2YWwgb2YgdGhlIGZpcnN0IHN0cmVhbWluZyB0cmFuc2FjdGlvbiwgdGhlCisJICogZmlsZXNl dCB3aWxsIGJlIGluaXRpYWxpemVkLCBhbmQgaXQgd2lsbCBiZSBkZWxldGVkIHdoZW4gdGhlIHdv cmtlcgorCSAqIGV4aXRzLiAgVW5kZXIgdGhpcywgc2VwYXJhdGUgYnVmZmlsZXMgd291bGQgYmUg Y3JlYXRlZCBmb3IgZWFjaAorCSAqIHRyYW5zYWN0aW9uIHdoaWNoIHdpbGwgYmUgZGVsZXRlZCBh ZnRlciB0aGUgdHJhbnNhY3Rpb24gaXMgZmluaXNoZWQuCisJICovCisJRmlsZVNldCAgICAqc3Ry ZWFtX2ZpbGVzZXQ7CisKIAkvKiBTdGF0cy4gKi8KIAlYTG9nUmVjUHRyCWxhc3RfbHNuOwogCVRp bWVzdGFtcFR6IGxhc3Rfc2VuZF90aW1lOwpAQCAtNzksNyArODgsNiBAQCBleHRlcm4gdm9pZCBs b2dpY2FscmVwX3dvcmtlcl9sYXVuY2goT2lkIGRiaWQsIE9pZCBzdWJpZCwgY29uc3QgY2hhciAq c3VibmFtZSwKIGV4dGVybiB2b2lkIGxvZ2ljYWxyZXBfd29ya2VyX3N0b3AoT2lkIHN1YmlkLCBP aWQgcmVsaWQpOwogZXh0ZXJuIHZvaWQgbG9naWNhbHJlcF93b3JrZXJfd2FrZXVwKE9pZCBzdWJp ZCwgT2lkIHJlbGlkKTsKIGV4dGVybiB2b2lkIGxvZ2ljYWxyZXBfd29ya2VyX3dha2V1cF9wdHIo TG9naWNhbFJlcFdvcmtlciAqd29ya2VyKTsKLWV4dGVybiB2b2lkIGxvZ2ljYWxyZXBfd29ya2Vy X2NsZWFudXBmaWxlc2V0KHZvaWQpOwogCiBleHRlcm4gaW50CWxvZ2ljYWxyZXBfc3luY193b3Jr ZXJfY291bnQoT2lkIHN1YmlkKTsKIApkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvc3RvcmFnZS9i dWZmaWxlLmggYi9zcmMvaW5jbHVkZS9zdG9yYWdlL2J1ZmZpbGUuaAppbmRleCAxNDNlYWRhLi43 YWU1ZWEyIDEwMDY0NAotLS0gYS9zcmMvaW5jbHVkZS9zdG9yYWdlL2J1ZmZpbGUuaAorKysgYi9z cmMvaW5jbHVkZS9zdG9yYWdlL2J1ZmZpbGUuaApAQCAtNDksOCArNDksOSBAQCBleHRlcm4gbG9u ZyBCdWZGaWxlQXBwZW5kKEJ1ZkZpbGUgKnRhcmdldCwgQnVmRmlsZSAqc291cmNlKTsKIGV4dGVy biBCdWZGaWxlICpCdWZGaWxlQ3JlYXRlRmlsZVNldChGaWxlU2V0ICpmaWxlc2V0LCBjb25zdCBj aGFyICpuYW1lKTsKIGV4dGVybiB2b2lkIEJ1ZkZpbGVFeHBvcnRGaWxlU2V0KEJ1ZkZpbGUgKmZp bGUpOwogZXh0ZXJuIEJ1ZkZpbGUgKkJ1ZkZpbGVPcGVuRmlsZVNldChGaWxlU2V0ICpmaWxlc2V0 LCBjb25zdCBjaGFyICpuYW1lLAotCQkJCQkJCQkgICBpbnQgbW9kZSk7Ci1leHRlcm4gdm9pZCBC dWZGaWxlRGVsZXRlRmlsZVNldChGaWxlU2V0ICpmaWxlc2V0LCBjb25zdCBjaGFyICpuYW1lKTsK KwkJCQkJCQkJICAgaW50IG1vZGUsIGJvb2wgbWlzc2luZ19vayk7CitleHRlcm4gdm9pZCBCdWZG aWxlRGVsZXRlRmlsZVNldChGaWxlU2V0ICpmaWxlc2V0LCBjb25zdCBjaGFyICpuYW1lLAorCQkJ CQkJCQkgYm9vbCBtaXNzaW5nX29rKTsKIGV4dGVybiB2b2lkIEJ1ZkZpbGVUcnVuY2F0ZUZpbGVT ZXQoQnVmRmlsZSAqZmlsZSwgaW50IGZpbGVubywgb2ZmX3Qgb2Zmc2V0KTsKIAogI2VuZGlmCQkJ CQkJCS8qIEJVRkZJTEVfSCAqLwotLSAKMS44LjMuMQoK --000000000000b10e9c05caedb643--