Message ID | 155353008041.10354.6909480084975809677.stgit@localhost.localdomain |
---|---|
State | New |
Series | "Revert "ploop: Remove excess variable"" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [108.177.122.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Mon, 25 Mar 2019 17:11:03 +0100 (CET) Received: by 2002:a5d:8b8b:0:0:0:0:0 with SMTP id p11csp4115149iol; Mon, 25 Mar 2019 09:10:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqwqthLtLfhmUL78buXe5Koi9Y5FXg6HsvdY7T4kNqJRUuN/m3PHBFhiEt9NFBby+xPk7NDG X-Received: by 2002:a63:9246:: with SMTP id s6mr24332407pgn.316.1553530257750; Mon, 25 Mar 2019 09:10:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553530257; cv=none; d=google.com; s=arc-20160816; b=nnpXKQzgB6SKh/XNDabWrBf4dHiqDXY/RFLXhSj/3lbA54jhfFkyIwNEk7DPMKGQwa SORoTxw1YiV74VYWeO30pZCJMWz0WRvSJ1WIBkIG3SuUV0feaHZbn61kkTyTYdfZvecD wtyPnmFFjOZlk0FWJDs8E3rVH/TM1Ywx18cjyx1yTT5TyBVUFdgPiNcWBxtgz/urs3sS h6fHiLhVFuv9ZwKfpatjSGEji6k//mMA9QLtJRhc3im8jt8FZPxcfkZ+mu4zz+iaOPUy pUBP6qc9Jmw/fILRczAyQKnNcHYj9b+mD9F3ldqyjLowrz866u7maoUesHRHBSBwtiDO 5sag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:user-agent:message-id:date:to:from; bh=As7NNgltoO5OSagpmWtB4R6MM5lzCoXCZngxMf3Plqw=; b=KgcCrgsOXV8xBFsIAvETpGxf8NjOKLiVSk0T1PTX8maI0jZZssLjWzLEFAVEqd0M7C vUyV9b9Qv/KOiVlOIOsoAdVznVhYyN2/Ap1QQzATEmf3DtCjXvqiZ8mUfp6mvvbq4Ze7 UZfit2dtAlkUg2KhId5oYaWw3zU0hr/kjS/tafRYv0NbpVi9BuC63ltiiCigfHA3LIZk zhlwIIAqCfJxRW92VdqEgJm3XxVF3sJ9sxtryJTIWmxOB42/zvFJM6eZzFydJzHhrqhf tpZZQ0peELWsiRiuajJFtMEnSqC/X68jgI5fJZLZrS9rW6yuBHiXIP5ez7mMbdnCdQ8f k/AQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id z20si1209256pgu.43.2019.03.25.09.10.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 09:10:57 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id x2PG8AZQ013203; Mon, 25 Mar 2019 19:08:16 +0300 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2051.outbound.protection.outlook.com [104.47.0.51]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id x2PG89P2013200 for <devel@openvz.org>; Mon, 25 Mar 2019 19:08:09 +0300 Received: from VI1PR0801CA0072.eurprd08.prod.outlook.com (2603:10a6:800:7d::16) by AM6PR08MB5096.eurprd08.prod.outlook.com (2603:10a6:20b:ee::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.19; Mon, 25 Mar 2019 16:08:09 +0000 Received: from VE1EUR01FT054.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e01::209) by VI1PR0801CA0072.outlook.office365.com (2603:10a6:800:7d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1730.18 via Frontend Transport; Mon, 25 Mar 2019 16:08:09 +0000 Authentication-Results: spf=pass (sender IP is 185.231.240.75) smtp.mailfrom=virtuozzo.com; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 185.231.240.75 as permitted sender) receiver=protection.outlook.com; client-ip=185.231.240.75; helo=relay.sw.ru; Received: from relay.sw.ru (185.231.240.75) by VE1EUR01FT054.mail.protection.outlook.com (10.152.2.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1730.9 via Frontend Transport; Mon, 25 Mar 2019 16:08:09 +0000 Received: from [172.16.25.169] (helo=localhost.localdomain) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from <ktkhai@virtuozzo.com>) id 1h8S8u-00052Y-8Z; Mon, 25 Mar 2019 19:08:08 +0300 From: Kirill Tkhai <ktkhai@virtuozzo.com> To: <devel@openvz.org>, <khorenko@virtuozzo.com>, <ktkhai@virtuozzo.com> Date: Mon, 25 Mar 2019 19:08:07 +0300 Message-ID: <155353008041.10354.6909480084975809677.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: SFV:SKI; SFV:SKN; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:AM6PR08MB5096; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 01e7ea47-7154-4805-34eb-08d6b13c12ea X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4709054)(2017052603328)(7153060); SRVR:AM6PR08MB5096; X-MS-TrafficTypeDiagnostic: AM6PR08MB5096: X-MS-Exchange-PUrlCount: 1 X-Microsoft-Antispam-Message-Info: =?utf-8?B?c3hQWFdOdlVvREtqdGY5NnhSNGRPd2VocC92amRQNkdIV2tUVms3Q2NSYVpK?= =?utf-8?B?Tllab2xySEdqc05aRTRhcXVlN1NSZlhNZmI0ZHQ1KytKdExqNzc4UDJzMmYr?= =?utf-8?B?RUJ2NG1INUhSNjRGNUw4RGVCeGUxUjBINEFnNEp4R0VlaWUxZlBTQkNCVlp5?= =?utf-8?B?b3gzdDlqNmF0SFhZeW9BdU1WTUJnQzNyK0tnTyttWVhkMEhmSFArODVxaEM5?= =?utf-8?B?M0RlQ3crOUVrR2ZiVHVhbG9DUWZDR0xDQ0dRSnZTVy9vQXlrRm84bnlLZlVk?= =?utf-8?B?eVVzNTFuUHlwY2NVRlBuZmdIaW8yYlBBcnUrZDNjNEs2SXNqelE0QUlBMFN0?= =?utf-8?B?Nms1amxqcUxPM1FwMklZOWZDbWorK0ZITEVyY1ZidVBvRjh1NzVCNEx3WEZi?= =?utf-8?B?cndQWHRXekFkVDF0ME4xbU1VeHJndVJNTm1RR1FqYW5mWEx0YjRnMXlqNmZJ?= =?utf-8?B?UG1jcmFMcE5RSWxreUZjK3R6U1pmc1dCWVlTZHJVYkxZd2xZODVNb3ViekNj?= =?utf-8?B?Q0NBT2hUVmxWYURwaHd1aGNONHF6QWpWcm9HSXdLSmlLcjY1akk0VlArWXRu?= =?utf-8?B?Rk8yZjdjRXRkcnJYdTJ5NllzeWxXYkJQRnlRNVc2RnBRaVhHWjRHeGh0Zk83?= =?utf-8?B?MWxianhVaUpnMVVOQW9SSldCR2Z5cHI0RHBCcTlZSHpRSFBHY1V2SFU1eHN5?= =?utf-8?B?NkczTU9QOS9qQW9sNGdsZk1RM0grSzFmZk54aXhzbnNEckdOR2w4SkNKZjlp?= =?utf-8?B?UTkzZUpWMlJ0YzdpaDRLam9MRS9xU3NEU2N1SU5rUDNGWS9DVXpOZWV5SVl6?= =?utf-8?B?citTNk1uOFFwdHdDV1ZhYkZJM3MxM1I5MnhmUlVpSkdMajNiTW1JTEVnZklj?= =?utf-8?B?V1dFREpIeWsxMjlVWktuSnpzMnJCWEZOSEJRY0VUZ3g3M29wOGhwc3A0dzQw?= =?utf-8?B?MkE3TmFSRHFtTDFzbkZEMmpwb2tCdTJhbzRMR3FHVXZZSktoQzZTaUtIZDV2?= =?utf-8?B?YW5WdUV2UFlZTXBzTzUvSm1pOExJUCtGVXlSNFdRVVZtNVNmNTNQY0g1Vy9D?= =?utf-8?B?OFg0dVk5WnpXaURXKzJ1b0MzYXNXNzAxSXRobnFSWHFDWTEzNWdmUXg3eTJv?= =?utf-8?B?TklEcmEvOHB6UVgrSUtCTDFhL0tyRjAzaDRWcngrYS9FdDVPdlIrVFhIekFk?= =?utf-8?B?YWZjcEo2dERHTGJlTnpuVFNCaWNkekJibUk2L2RoQys0Z0NGSjcyd0tZVFow?= =?utf-8?B?Sk9LUzlnRnRUWUNtdWV2Ynk1YVNXUEh0bWlTMGhZYVg0V09XQT09?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2019 16:08:09.2496 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01e7ea47-7154-4805-34eb-08d6b13c12ea X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[185.231.240.75]; Helo=[relay.sw.ru] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB5096 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 185.231.240.75 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: VE1EUR01FT054.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKN; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: AM6PR08MB5096.eurprd08.prod.outlook.com Subject: [Devel] [PATCH] Revert "ploop: Remove excess variable" X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/drivers/block/ploop/dev.c b/drivers/block/ploop/dev.c index 1d6ee2329bb9..f8b9b0bcba78 100644 --- a/drivers/block/ploop/dev.c +++ b/drivers/block/ploop/dev.c @@ -2565,6 +2565,7 @@ static void ploop_req_state_process(struct ploop_request * preq) struct ploop_device * plo = preq->plo; struct ploop_delta * top_delta; struct io_context * saved_ioc = NULL; + int release_ioc = 0; #ifdef CONFIG_BEANCOUNTERS struct user_beancounter *saved_ub = NULL; #endif @@ -2575,6 +2576,7 @@ static void ploop_req_state_process(struct ploop_request * preq) saved_ioc = current->io_context; current->io_context = preq->ioc; atomic_long_inc(&preq->ioc->refcount); + release_ioc = 1; } #ifdef CONFIG_BEANCOUNTERS WARN_ONCE(!preq->preq_ub, @@ -2906,7 +2908,7 @@ static void ploop_req_state_process(struct ploop_request * preq) BUG(); } out: - if (saved_ioc) { + if (release_ioc) { struct io_context * ioc = current->io_context; current->io_context = saved_ioc; put_io_context(ioc);
saved_ioc may be NULL. Then we increment the counter and never decrement it. It even may overflow later. https://jira.sw.ru/browse/PSBM-93006 Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- drivers/block/ploop/dev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)