From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94010C43603 for ; Tue, 17 Dec 2019 16:10:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CB2221582 for ; Tue, 17 Dec 2019 16:10:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="SE9hhwD3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727480AbfLQQKf (ORCPT ); Tue, 17 Dec 2019 11:10:35 -0500 Received: from smtp-fw-4101.amazon.com ([72.21.198.25]:36309 "EHLO smtp-fw-4101.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727427AbfLQQKe (ORCPT ); Tue, 17 Dec 2019 11:10:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1576599034; x=1608135034; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=X93izDi+OFRUN5FGBE4eNUsCd4hh4S1nRuspQbSs7oM=; b=SE9hhwD39rxL/tVLBUWI2n6JVW5x96ji4yVNO90n6+M7/oRegzOxzJPO ZngD9nzW23XCaj5UfrePbH3vYflY+kXOymWCFDn3KeOlpgRui1eCS38wq eYCb6LHQkT1Q5bV3zTwH7miHhamiriqQKn1y5wKKnoMqGJKcNPlsfWfK7 Q=; IronPort-SDR: 70ddUbeW6owvy2EsZEB5V7klIKYTlDr9YFdJgX2Vus9Ax3jr06+HmRW82KbVIgZc2xnkseooqS yAEfbOh9IRNg== X-IronPort-AV: E=Sophos;i="5.69,326,1571702400"; d="scan'208";a="8883589" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-2c-6f38efd9.us-west-2.amazon.com) ([10.43.8.6]) by smtp-border-fw-out-4101.iad4.amazon.com with ESMTP; 17 Dec 2019 16:10:33 +0000 Received: from EX13MTAUEA002.ant.amazon.com (pdx4-ws-svc-p6-lb7-vlan3.pdx.amazon.com [10.170.41.166]) by email-inbound-relay-2c-6f38efd9.us-west-2.amazon.com (Postfix) with ESMTPS id BBB14A1D78; Tue, 17 Dec 2019 16:10:31 +0000 (UTC) Received: from EX13D31EUA001.ant.amazon.com (10.43.165.15) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1236.3; Tue, 17 Dec 2019 16:10:31 +0000 Received: from u886c93fd17d25d.ant.amazon.com (10.43.161.179) by EX13D31EUA001.ant.amazon.com (10.43.165.15) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Tue, 17 Dec 2019 16:10:26 +0000 From: SeongJae Park To: , , , CC: SeongJae Park , , , , , , Subject: [PATCH v11 5/6] xen/blkback: Remove unnecessary static variable name prefixes Date: Tue, 17 Dec 2019 17:10:07 +0100 Message-ID: <20191217161007.1102-1-sjpark@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217160748.693-1-sjpark@amazon.com> References: <20191217160748.693-1-sjpark@amazon.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.43.161.179] X-ClientProxiedBy: EX13D16UWC002.ant.amazon.com (10.43.162.161) To EX13D31EUA001.ant.amazon.com (10.43.165.15) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: SeongJae Park A few of static variables in blkback have 'xen_blkif_' prefix, though it is unnecessary for static variables. This commit removes such prefixes. Reviewed-by: Roger Pau Monné Signed-off-by: SeongJae Park --- drivers/block/xen-blkback/blkback.c | 37 +++++++++++++---------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index 79f677aeb5cc..fbd67f8e4e4e 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -62,8 +62,8 @@ * IO workloads. */ -static int xen_blkif_max_buffer_pages = 1024; -module_param_named(max_buffer_pages, xen_blkif_max_buffer_pages, int, 0644); +static int max_buffer_pages = 1024; +module_param_named(max_buffer_pages, max_buffer_pages, int, 0644); MODULE_PARM_DESC(max_buffer_pages, "Maximum number of free pages to keep in each block backend buffer"); @@ -78,8 +78,8 @@ MODULE_PARM_DESC(max_buffer_pages, * algorithm. */ -static int xen_blkif_max_pgrants = 1056; -module_param_named(max_persistent_grants, xen_blkif_max_pgrants, int, 0644); +static int max_pgrants = 1056; +module_param_named(max_persistent_grants, max_pgrants, int, 0644); MODULE_PARM_DESC(max_persistent_grants, "Maximum number of grants to map persistently"); @@ -88,8 +88,8 @@ MODULE_PARM_DESC(max_persistent_grants, * use. The time is in seconds, 0 means indefinitely long. */ -static unsigned int xen_blkif_pgrant_timeout = 60; -module_param_named(persistent_grant_unused_seconds, xen_blkif_pgrant_timeout, +static unsigned int pgrant_timeout = 60; +module_param_named(persistent_grant_unused_seconds, pgrant_timeout, uint, 0644); MODULE_PARM_DESC(persistent_grant_unused_seconds, "Time in seconds an unused persistent grant is allowed to " @@ -137,9 +137,8 @@ module_param(log_stats, int, 0644); static inline bool persistent_gnt_timeout(struct persistent_gnt *persistent_gnt) { - return xen_blkif_pgrant_timeout && - (jiffies - persistent_gnt->last_used >= - HZ * xen_blkif_pgrant_timeout); + return pgrant_timeout && (jiffies - persistent_gnt->last_used >= + HZ * pgrant_timeout); } static inline int get_free_page(struct xen_blkif_ring *ring, struct page **page) @@ -234,7 +233,7 @@ static int add_persistent_gnt(struct xen_blkif_ring *ring, struct persistent_gnt *this; struct xen_blkif *blkif = ring->blkif; - if (ring->persistent_gnt_c >= xen_blkif_max_pgrants) { + if (ring->persistent_gnt_c >= max_pgrants) { if (!blkif->vbd.overflow_max_grants) blkif->vbd.overflow_max_grants = 1; return -EBUSY; @@ -397,14 +396,13 @@ static void purge_persistent_gnt(struct xen_blkif_ring *ring) goto out; } - if (ring->persistent_gnt_c < xen_blkif_max_pgrants || - (ring->persistent_gnt_c == xen_blkif_max_pgrants && + if (ring->persistent_gnt_c < max_pgrants || + (ring->persistent_gnt_c == max_pgrants && !ring->blkif->vbd.overflow_max_grants)) { num_clean = 0; } else { - num_clean = (xen_blkif_max_pgrants / 100) * LRU_PERCENT_CLEAN; - num_clean = ring->persistent_gnt_c - xen_blkif_max_pgrants + - num_clean; + num_clean = (max_pgrants / 100) * LRU_PERCENT_CLEAN; + num_clean = ring->persistent_gnt_c - max_pgrants + num_clean; num_clean = min(ring->persistent_gnt_c, num_clean); pr_debug("Going to purge at least %u persistent grants\n", num_clean); @@ -599,8 +597,7 @@ static void print_stats(struct xen_blkif_ring *ring) current->comm, ring->st_oo_req, ring->st_rd_req, ring->st_wr_req, ring->st_f_req, ring->st_ds_req, - ring->persistent_gnt_c, - xen_blkif_max_pgrants); + ring->persistent_gnt_c, max_pgrants); ring->st_print = jiffies + msecs_to_jiffies(10 * 1000); ring->st_rd_req = 0; ring->st_wr_req = 0; @@ -660,7 +657,7 @@ int xen_blkif_schedule(void *arg) if (time_before(jiffies, blkif->buffer_squeeze_end)) shrink_free_pagepool(ring, 0); else - shrink_free_pagepool(ring, xen_blkif_max_buffer_pages); + shrink_free_pagepool(ring, max_buffer_pages); if (log_stats && time_after(jiffies, ring->st_print)) print_stats(ring); @@ -887,7 +884,7 @@ static int xen_blkbk_map(struct xen_blkif_ring *ring, continue; } if (use_persistent_gnts && - ring->persistent_gnt_c < xen_blkif_max_pgrants) { + ring->persistent_gnt_c < max_pgrants) { /* * We are using persistent grants, the grant is * not mapped but we might have room for it. @@ -914,7 +911,7 @@ static int xen_blkbk_map(struct xen_blkif_ring *ring, pages[seg_idx]->persistent_gnt = persistent_gnt; pr_debug("grant %u added to the tree of persistent grants, using %u/%u\n", persistent_gnt->gnt, ring->persistent_gnt_c, - xen_blkif_max_pgrants); + max_pgrants); goto next; } if (use_persistent_gnts && !blkif->vbd.overflow_max_grants) { -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIM_ADSP_ALL,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98F86C43603 for ; Tue, 17 Dec 2019 16:10:47 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6B09621582 for ; Tue, 17 Dec 2019 16:10:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="SE9hhwD3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B09621582 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ihFQh-0007C9-VP; Tue, 17 Dec 2019 16:10:35 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ihFQh-0007C0-Dg for xen-devel@lists.xenproject.org; Tue, 17 Dec 2019 16:10:35 +0000 X-Inumbo-ID: c0f42f86-20e7-11ea-88e7-bc764e2007e4 Received: from smtp-fw-4101.amazon.com (unknown [72.21.198.25]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c0f42f86-20e7-11ea-88e7-bc764e2007e4; Tue, 17 Dec 2019 16:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1576599034; x=1608135034; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=X93izDi+OFRUN5FGBE4eNUsCd4hh4S1nRuspQbSs7oM=; b=SE9hhwD39rxL/tVLBUWI2n6JVW5x96ji4yVNO90n6+M7/oRegzOxzJPO ZngD9nzW23XCaj5UfrePbH3vYflY+kXOymWCFDn3KeOlpgRui1eCS38wq eYCb6LHQkT1Q5bV3zTwH7miHhamiriqQKn1y5wKKnoMqGJKcNPlsfWfK7 Q=; IronPort-SDR: 70ddUbeW6owvy2EsZEB5V7klIKYTlDr9YFdJgX2Vus9Ax3jr06+HmRW82KbVIgZc2xnkseooqS yAEfbOh9IRNg== X-IronPort-AV: E=Sophos;i="5.69,326,1571702400"; d="scan'208";a="8883589" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-2c-6f38efd9.us-west-2.amazon.com) ([10.43.8.6]) by smtp-border-fw-out-4101.iad4.amazon.com with ESMTP; 17 Dec 2019 16:10:33 +0000 Received: from EX13MTAUEA002.ant.amazon.com (pdx4-ws-svc-p6-lb7-vlan3.pdx.amazon.com [10.170.41.166]) by email-inbound-relay-2c-6f38efd9.us-west-2.amazon.com (Postfix) with ESMTPS id BBB14A1D78; Tue, 17 Dec 2019 16:10:31 +0000 (UTC) Received: from EX13D31EUA001.ant.amazon.com (10.43.165.15) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1236.3; Tue, 17 Dec 2019 16:10:31 +0000 Received: from u886c93fd17d25d.ant.amazon.com (10.43.161.179) by EX13D31EUA001.ant.amazon.com (10.43.165.15) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Tue, 17 Dec 2019 16:10:26 +0000 From: SeongJae Park To: , , , Date: Tue, 17 Dec 2019 17:10:07 +0100 Message-ID: <20191217161007.1102-1-sjpark@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191217160748.693-1-sjpark@amazon.com> References: <20191217160748.693-1-sjpark@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.43.161.179] X-ClientProxiedBy: EX13D16UWC002.ant.amazon.com (10.43.162.161) To EX13D31EUA001.ant.amazon.com (10.43.165.15) Precedence: Bulk Subject: [Xen-devel] [PATCH v11 5/6] xen/blkback: Remove unnecessary static variable name prefixes X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: linux-block@vger.kernel.org, sjpark@amazon.com, pdurrant@amazon.com, SeongJae Park , linux-kernel@vger.kernel.org, sj38.park@gmail.com, xen-devel@lists.xenproject.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" RnJvbTogU2VvbmdKYWUgUGFyayA8c2pwYXJrQGFtYXpvbi5kZT4KCkEgZmV3IG9mIHN0YXRpYyB2 YXJpYWJsZXMgaW4gYmxrYmFjayBoYXZlICd4ZW5fYmxraWZfJyBwcmVmaXgsIHRob3VnaCBpdApp cyB1bm5lY2Vzc2FyeSBmb3Igc3RhdGljIHZhcmlhYmxlcy4gIFRoaXMgY29tbWl0IHJlbW92ZXMg c3VjaCBwcmVmaXhlcy4KClJldmlld2VkLWJ5OiBSb2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVA Y2l0cml4LmNvbT4KU2lnbmVkLW9mZi1ieTogU2VvbmdKYWUgUGFyayA8c2pwYXJrQGFtYXpvbi5k ZT4KLS0tCiBkcml2ZXJzL2Jsb2NrL3hlbi1ibGtiYWNrL2Jsa2JhY2suYyB8IDM3ICsrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwg MjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ibG9jay94ZW4tYmxrYmFjay9i bGtiYWNrLmMgYi9kcml2ZXJzL2Jsb2NrL3hlbi1ibGtiYWNrL2Jsa2JhY2suYwppbmRleCA3OWY2 NzdhZWI1Y2MuLmZiZDY3ZjhlNGU0ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ibG9jay94ZW4tYmxr YmFjay9ibGtiYWNrLmMKKysrIGIvZHJpdmVycy9ibG9jay94ZW4tYmxrYmFjay9ibGtiYWNrLmMK QEAgLTYyLDggKzYyLDggQEAKICAqIElPIHdvcmtsb2Fkcy4KICAqLwogCi1zdGF0aWMgaW50IHhl bl9ibGtpZl9tYXhfYnVmZmVyX3BhZ2VzID0gMTAyNDsKLW1vZHVsZV9wYXJhbV9uYW1lZChtYXhf YnVmZmVyX3BhZ2VzLCB4ZW5fYmxraWZfbWF4X2J1ZmZlcl9wYWdlcywgaW50LCAwNjQ0KTsKK3N0 YXRpYyBpbnQgbWF4X2J1ZmZlcl9wYWdlcyA9IDEwMjQ7Cittb2R1bGVfcGFyYW1fbmFtZWQobWF4 X2J1ZmZlcl9wYWdlcywgbWF4X2J1ZmZlcl9wYWdlcywgaW50LCAwNjQ0KTsKIE1PRFVMRV9QQVJN X0RFU0MobWF4X2J1ZmZlcl9wYWdlcywKICJNYXhpbXVtIG51bWJlciBvZiBmcmVlIHBhZ2VzIHRv IGtlZXAgaW4gZWFjaCBibG9jayBiYWNrZW5kIGJ1ZmZlciIpOwogCkBAIC03OCw4ICs3OCw4IEBA IE1PRFVMRV9QQVJNX0RFU0MobWF4X2J1ZmZlcl9wYWdlcywKICAqIGFsZ29yaXRobS4KICAqLwog Ci1zdGF0aWMgaW50IHhlbl9ibGtpZl9tYXhfcGdyYW50cyA9IDEwNTY7Ci1tb2R1bGVfcGFyYW1f bmFtZWQobWF4X3BlcnNpc3RlbnRfZ3JhbnRzLCB4ZW5fYmxraWZfbWF4X3BncmFudHMsIGludCwg MDY0NCk7CitzdGF0aWMgaW50IG1heF9wZ3JhbnRzID0gMTA1NjsKK21vZHVsZV9wYXJhbV9uYW1l ZChtYXhfcGVyc2lzdGVudF9ncmFudHMsIG1heF9wZ3JhbnRzLCBpbnQsIDA2NDQpOwogTU9EVUxF X1BBUk1fREVTQyhtYXhfcGVyc2lzdGVudF9ncmFudHMsCiAgICAgICAgICAgICAgICAgICJNYXhp bXVtIG51bWJlciBvZiBncmFudHMgdG8gbWFwIHBlcnNpc3RlbnRseSIpOwogCkBAIC04OCw4ICs4 OCw4IEBAIE1PRFVMRV9QQVJNX0RFU0MobWF4X3BlcnNpc3RlbnRfZ3JhbnRzLAogICogdXNlLiBU aGUgdGltZSBpcyBpbiBzZWNvbmRzLCAwIG1lYW5zIGluZGVmaW5pdGVseSBsb25nLgogICovCiAK LXN0YXRpYyB1bnNpZ25lZCBpbnQgeGVuX2Jsa2lmX3BncmFudF90aW1lb3V0ID0gNjA7Ci1tb2R1 bGVfcGFyYW1fbmFtZWQocGVyc2lzdGVudF9ncmFudF91bnVzZWRfc2Vjb25kcywgeGVuX2Jsa2lm X3BncmFudF90aW1lb3V0LAorc3RhdGljIHVuc2lnbmVkIGludCBwZ3JhbnRfdGltZW91dCA9IDYw OworbW9kdWxlX3BhcmFtX25hbWVkKHBlcnNpc3RlbnRfZ3JhbnRfdW51c2VkX3NlY29uZHMsIHBn cmFudF90aW1lb3V0LAogCQkgICB1aW50LCAwNjQ0KTsKIE1PRFVMRV9QQVJNX0RFU0MocGVyc2lz dGVudF9ncmFudF91bnVzZWRfc2Vjb25kcywKIAkJICJUaW1lIGluIHNlY29uZHMgYW4gdW51c2Vk IHBlcnNpc3RlbnQgZ3JhbnQgaXMgYWxsb3dlZCB0byAiCkBAIC0xMzcsOSArMTM3LDggQEAgbW9k dWxlX3BhcmFtKGxvZ19zdGF0cywgaW50LCAwNjQ0KTsKIAogc3RhdGljIGlubGluZSBib29sIHBl cnNpc3RlbnRfZ250X3RpbWVvdXQoc3RydWN0IHBlcnNpc3RlbnRfZ250ICpwZXJzaXN0ZW50X2du dCkKIHsKLQlyZXR1cm4geGVuX2Jsa2lmX3BncmFudF90aW1lb3V0ICYmCi0JICAgICAgIChqaWZm aWVzIC0gcGVyc2lzdGVudF9nbnQtPmxhc3RfdXNlZCA+PQotCQlIWiAqIHhlbl9ibGtpZl9wZ3Jh bnRfdGltZW91dCk7CisJcmV0dXJuIHBncmFudF90aW1lb3V0ICYmIChqaWZmaWVzIC0gcGVyc2lz dGVudF9nbnQtPmxhc3RfdXNlZCA+PQorCQkJSFogKiBwZ3JhbnRfdGltZW91dCk7CiB9CiAKIHN0 YXRpYyBpbmxpbmUgaW50IGdldF9mcmVlX3BhZ2Uoc3RydWN0IHhlbl9ibGtpZl9yaW5nICpyaW5n LCBzdHJ1Y3QgcGFnZSAqKnBhZ2UpCkBAIC0yMzQsNyArMjMzLDcgQEAgc3RhdGljIGludCBhZGRf cGVyc2lzdGVudF9nbnQoc3RydWN0IHhlbl9ibGtpZl9yaW5nICpyaW5nLAogCXN0cnVjdCBwZXJz aXN0ZW50X2dudCAqdGhpczsKIAlzdHJ1Y3QgeGVuX2Jsa2lmICpibGtpZiA9IHJpbmctPmJsa2lm OwogCi0JaWYgKHJpbmctPnBlcnNpc3RlbnRfZ250X2MgPj0geGVuX2Jsa2lmX21heF9wZ3JhbnRz KSB7CisJaWYgKHJpbmctPnBlcnNpc3RlbnRfZ250X2MgPj0gbWF4X3BncmFudHMpIHsKIAkJaWYg KCFibGtpZi0+dmJkLm92ZXJmbG93X21heF9ncmFudHMpCiAJCQlibGtpZi0+dmJkLm92ZXJmbG93 X21heF9ncmFudHMgPSAxOwogCQlyZXR1cm4gLUVCVVNZOwpAQCAtMzk3LDE0ICszOTYsMTMgQEAg c3RhdGljIHZvaWQgcHVyZ2VfcGVyc2lzdGVudF9nbnQoc3RydWN0IHhlbl9ibGtpZl9yaW5nICpy aW5nKQogCQlnb3RvIG91dDsKIAl9CiAKLQlpZiAocmluZy0+cGVyc2lzdGVudF9nbnRfYyA8IHhl bl9ibGtpZl9tYXhfcGdyYW50cyB8fAotCSAgICAocmluZy0+cGVyc2lzdGVudF9nbnRfYyA9PSB4 ZW5fYmxraWZfbWF4X3BncmFudHMgJiYKKwlpZiAocmluZy0+cGVyc2lzdGVudF9nbnRfYyA8IG1h eF9wZ3JhbnRzIHx8CisJICAgIChyaW5nLT5wZXJzaXN0ZW50X2dudF9jID09IG1heF9wZ3JhbnRz ICYmCiAJICAgICFyaW5nLT5ibGtpZi0+dmJkLm92ZXJmbG93X21heF9ncmFudHMpKSB7CiAJCW51 bV9jbGVhbiA9IDA7CiAJfSBlbHNlIHsKLQkJbnVtX2NsZWFuID0gKHhlbl9ibGtpZl9tYXhfcGdy YW50cyAvIDEwMCkgKiBMUlVfUEVSQ0VOVF9DTEVBTjsKLQkJbnVtX2NsZWFuID0gcmluZy0+cGVy c2lzdGVudF9nbnRfYyAtIHhlbl9ibGtpZl9tYXhfcGdyYW50cyArCi0JCQkgICAgbnVtX2NsZWFu OworCQludW1fY2xlYW4gPSAobWF4X3BncmFudHMgLyAxMDApICogTFJVX1BFUkNFTlRfQ0xFQU47 CisJCW51bV9jbGVhbiA9IHJpbmctPnBlcnNpc3RlbnRfZ250X2MgLSBtYXhfcGdyYW50cyArIG51 bV9jbGVhbjsKIAkJbnVtX2NsZWFuID0gbWluKHJpbmctPnBlcnNpc3RlbnRfZ250X2MsIG51bV9j bGVhbik7CiAJCXByX2RlYnVnKCJHb2luZyB0byBwdXJnZSBhdCBsZWFzdCAldSBwZXJzaXN0ZW50 IGdyYW50c1xuIiwKIAkJCSBudW1fY2xlYW4pOwpAQCAtNTk5LDggKzU5Nyw3IEBAIHN0YXRpYyB2 b2lkIHByaW50X3N0YXRzKHN0cnVjdCB4ZW5fYmxraWZfcmluZyAqcmluZykKIAkJIGN1cnJlbnQt PmNvbW0sIHJpbmctPnN0X29vX3JlcSwKIAkJIHJpbmctPnN0X3JkX3JlcSwgcmluZy0+c3Rfd3Jf cmVxLAogCQkgcmluZy0+c3RfZl9yZXEsIHJpbmctPnN0X2RzX3JlcSwKLQkJIHJpbmctPnBlcnNp c3RlbnRfZ250X2MsCi0JCSB4ZW5fYmxraWZfbWF4X3BncmFudHMpOworCQkgcmluZy0+cGVyc2lz dGVudF9nbnRfYywgbWF4X3BncmFudHMpOwogCXJpbmctPnN0X3ByaW50ID0gamlmZmllcyArIG1z ZWNzX3RvX2ppZmZpZXMoMTAgKiAxMDAwKTsKIAlyaW5nLT5zdF9yZF9yZXEgPSAwOwogCXJpbmct PnN0X3dyX3JlcSA9IDA7CkBAIC02NjAsNyArNjU3LDcgQEAgaW50IHhlbl9ibGtpZl9zY2hlZHVs ZSh2b2lkICphcmcpCiAJCWlmICh0aW1lX2JlZm9yZShqaWZmaWVzLCBibGtpZi0+YnVmZmVyX3Nx dWVlemVfZW5kKSkKIAkJCXNocmlua19mcmVlX3BhZ2Vwb29sKHJpbmcsIDApOwogCQllbHNlCi0J CQlzaHJpbmtfZnJlZV9wYWdlcG9vbChyaW5nLCB4ZW5fYmxraWZfbWF4X2J1ZmZlcl9wYWdlcyk7 CisJCQlzaHJpbmtfZnJlZV9wYWdlcG9vbChyaW5nLCBtYXhfYnVmZmVyX3BhZ2VzKTsKIAogCQlp ZiAobG9nX3N0YXRzICYmIHRpbWVfYWZ0ZXIoamlmZmllcywgcmluZy0+c3RfcHJpbnQpKQogCQkJ cHJpbnRfc3RhdHMocmluZyk7CkBAIC04ODcsNyArODg0LDcgQEAgc3RhdGljIGludCB4ZW5fYmxr YmtfbWFwKHN0cnVjdCB4ZW5fYmxraWZfcmluZyAqcmluZywKIAkJCWNvbnRpbnVlOwogCQl9CiAJ CWlmICh1c2VfcGVyc2lzdGVudF9nbnRzICYmCi0JCSAgICByaW5nLT5wZXJzaXN0ZW50X2dudF9j IDwgeGVuX2Jsa2lmX21heF9wZ3JhbnRzKSB7CisJCSAgICByaW5nLT5wZXJzaXN0ZW50X2dudF9j IDwgbWF4X3BncmFudHMpIHsKIAkJCS8qCiAJCQkgKiBXZSBhcmUgdXNpbmcgcGVyc2lzdGVudCBn cmFudHMsIHRoZSBncmFudCBpcwogCQkJICogbm90IG1hcHBlZCBidXQgd2UgbWlnaHQgaGF2ZSBy b29tIGZvciBpdC4KQEAgLTkxNCw3ICs5MTEsNyBAQCBzdGF0aWMgaW50IHhlbl9ibGtia19tYXAo c3RydWN0IHhlbl9ibGtpZl9yaW5nICpyaW5nLAogCQkJcGFnZXNbc2VnX2lkeF0tPnBlcnNpc3Rl bnRfZ250ID0gcGVyc2lzdGVudF9nbnQ7CiAJCQlwcl9kZWJ1ZygiZ3JhbnQgJXUgYWRkZWQgdG8g dGhlIHRyZWUgb2YgcGVyc2lzdGVudCBncmFudHMsIHVzaW5nICV1LyV1XG4iLAogCQkJCSBwZXJz aXN0ZW50X2dudC0+Z250LCByaW5nLT5wZXJzaXN0ZW50X2dudF9jLAotCQkJCSB4ZW5fYmxraWZf bWF4X3BncmFudHMpOworCQkJCSBtYXhfcGdyYW50cyk7CiAJCQlnb3RvIG5leHQ7CiAJCX0KIAkJ aWYgKHVzZV9wZXJzaXN0ZW50X2dudHMgJiYgIWJsa2lmLT52YmQub3ZlcmZsb3dfbWF4X2dyYW50 cykgewotLSAKMi4xNy4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVj dC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1k ZXZlbA==