Message ID | 20191105103957.5100-1-aryabinin@virtuozzo.com |
---|---|
State | New |
Series | "Series without cover letter" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.131.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Tue, 05 Nov 2019 11:42:25 +0100 (CET) Received: by 2002:a6b:6312:0:0:0:0:0 with SMTP id p18csp460008iog; Tue, 5 Nov 2019 02:42:19 -0800 (PST) X-Google-Smtp-Source: APXvYqxt/Z9TtEbDTVqZ6+JLvkhzup58Xm8SGPzcxmRBHK0YRf8/foiDgzJG+60M9xbNaxn3M0hl X-Received: by 2002:a2e:9194:: with SMTP id f20mr11173686ljg.154.1572950539707; Tue, 05 Nov 2019 02:42:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572950539; cv=none; d=google.com; s=arc-20160816; b=ZZM2a+e0iO/cCR4+hAi+AD4zzgxPzisvtQ+REOA8nR5VXzAceDv3m729Ww6GNnfnQo FVhfRVrV7WUcpdenb78skZFhj5aAGh/UN4auXqa0WGuoTAruaZZPuDemEtzSFNRvwhkY tBTZXQdxqUwEjpwlJuSltJqjfyvODiO+2MPRI9x5NfSZsw15Fn7IGmoO1wSzo885ARi1 vBKyGoXUazj2YIJT42gB/De7wmbyrgXyWZj/ptHu6kA04Pz6L0Vz0yhpXZkFUOD95sAS pmR2uVjZPZgGMm9TTsS4L92VVsZfRntEU6vOluykqcmUdaUcmUPvp60Mg2/zgrcrPxjK mySQ== 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:message-id:date:to:from; bh=us02Fd1UHQ8+V9ByWbDiI12Vn4RKq0b3wk0q8cyIISk=; b=AkNotUNwVR2Of1C9EI8TypLWNRQHl4ovOKgWlhMEIM6J8kp9/lQguQv1ULIEwvTSb0 JiLKHxJx2PfUeEuKXk0HqKh0H0Sd+PUbNgXDVWWC7gm2ecuBnoP5+t0rhrdOnIYW/oS8 zM3P7XpK6ET14l5f1kvY6BUdifRaYaAhRwOBIqnsHdTrkFfvHlCD8t3cXKbckOtX718U nUkj+5Py54VhChwQNO/nz7d8X0DqaEC5q6onWQctpmFFwpxQal3U/u2IaIEy8t/3R5MB qv3HhjAJ0ITO3tKgytLpXba1RCfBsDshGWEnRCEhhvyCOfPBO/BVgoG2cJkMyIM2vdPq EXOQ== 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 j24si21902786lfh.96.2019.11.05.02.42.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Nov 2019 02:42:19 -0800 (PST) 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 xA5AeRxY010896; Tue, 5 Nov 2019 13:40:33 +0300 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2054.outbound.protection.outlook.com [104.47.12.54]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id xA5AeO3U010891 for <devel@openvz.org>; Tue, 5 Nov 2019 13:40:25 +0300 Received: from DB7PR08CA0009.eurprd08.prod.outlook.com (2603:10a6:5:16::22) by HE1PR08MB2890.eurprd08.prod.outlook.com (2603:10a6:7:36::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2408.24; Tue, 5 Nov 2019 10:40:25 +0000 Received: from DB5EUR01FT052.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e02::201) by DB7PR08CA0009.outlook.office365.com (2603:10a6:5:16::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2408.24 via Frontend Transport; Tue, 5 Nov 2019 10:40:25 +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 DB5EUR01FT052.mail.protection.outlook.com (10.152.5.248) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2387.20 via Frontend Transport; Tue, 5 Nov 2019 10:40:25 +0000 Received: from [172.16.25.5] (helo=i7.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from <aryabinin@virtuozzo.com>) id 1iRwG8-0006PL-JA; Tue, 05 Nov 2019 13:40:24 +0300 From: Andrey Ryabinin <aryabinin@virtuozzo.com> To: devel@openvz.org Date: Tue, 5 Nov 2019 13:39:56 +0300 Message-Id: <20191105103957.5100-1-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: SFV:SKI; SFV:SKN; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:HE1PR08MB2890; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dc273666-5ef0-4899-c06d-08d761dc9146 X-MS-TrafficTypeDiagnostic: HE1PR08MB2890: X-MS-Oob-TLC-OOBClassifiers: OLM:1388; X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?h985QGVubQHhu1Cy0IBAD0yoG8etxnxSGT8nOvIeg1qDy6TfthQIJhc6gHvm?= =?us-ascii?Q?GKVOsG1avaPgJT3mu4tQOzwQF7dnDg6M/JGBV+6Pw9x4jilvx8A714Gl52V5?= =?us-ascii?Q?Dvot38DtkEiXq9LWUh4Eq9iqCSW8EVqbE2q/Bw133uVp/yq9jID1PsLX3HCV?= =?us-ascii?Q?FUmGYOY93+L6zId+b8YKBCDOu+Z8HsHYGGaX3Fy5GHIl52cSrMMkwFPW0lmq?= =?us-ascii?Q?9O3yeNmheyWCFmPjhMPAi1fvtWG0d/6M7xQI5XFyHdXoaHS5N+6oo/Onwim1?= =?us-ascii?Q?clXqzcc51VSYJzjEeMAUNbncMAPvNfyvtzOhCNZlePPIYR9Yc9DD7w/X8Nyl?= =?us-ascii?Q?cvA8bkd3DY2Hu+YvmPj9RN1oHkX/J+D3+W88jntjQPfCFny+8KP0RERUwk0x?= =?us-ascii?Q?DIajEZWd4U+Ql1HcWvGZUM/bBZc7bckq0WWUr0I7oaWZ6tz7MQ+4/jbn1hpS?= =?us-ascii?Q?J+mHmNXsr7A+aMEhrhOonAbHMUpKuLjGfA+pELpX6tSTxZLvFYlG5tsXYhJn?= =?us-ascii?Q?CQsMDh9rCEBV9oToMhwQ223z6Wb5VEXsEn+yQBOvEm147s+nrOqt8gh9X86G?= =?us-ascii?Q?NdJQdGi1laGEkZKROp72bEy24zJn9lMScjjB690HWM0EIz4Oa7CHzRJofB3h?= =?us-ascii?Q?3XWgNvoSfYzIEhg4/Qv+KEXFE4CIFNbXv0UUAMtRCC4kgwIic2+aBOITnbRw?= =?us-ascii?Q?0vgDzofDW5NploOHE9ec9bWP9Mn35zsdNr0w4mIMCoZQxAmgTOCVgnPdeG+W?= =?us-ascii?Q?WJHjolE0mAT9TL4iMEglm226CPys5JQWsNUiOEOI38MgWjyU9+tlajl9ZbPs?= =?us-ascii?Q?an4Cajv5tUnMqhqnYjQGPLVYNWmO8ciqL1mHA6KMAQx6g8RR5/HFTm98PnrY?= =?us-ascii?Q?FBhMAkHrBytRMjnpCQibw2xDQfIGfdpN1IVQmXMGeTQIBkrNjLHKMPNKLx2R?= =?us-ascii?Q?1B2LfkXAyECcx60afdAwbiJRq5g6jJNtlVf2ZwEjyFarv6trhyCSIuU9ovGQ?= =?us-ascii?Q?//DU6vEWso12ZFJCjh3t3egJSEpYPmCVMhbZOOFv849RwH3sErT9MyS49nqo?= =?us-ascii?Q?x4FtAz4Gv2Jv3TR//eMU3jJUZ/8PQyDpTiX/6aEjYsNl9a2MsnU=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2019 10:40:25.4226 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc273666-5ef0-4899-c06d-08d761dc9146 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: HE1PR08MB2890 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 185.231.240.75 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: DB5EUR01FT052.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: HE1PR08MB2890.eurprd08.prod.outlook.com Subject: [Devel] [PATCH rh7 1/2] nbd: move nbd_size_update() of of the loop. 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/nbd.c b/drivers/block/nbd.c index 79de456643cf..362fe546cb2c 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -974,11 +974,10 @@ static int nbd_start_device(struct nbd_device *nbd, struct block_device *bdev) args->nbd = nbd; args->index = i; queue_work(recv_workqueue, &args->work); - nbd_size_update(nbd); if (max_part) bdev->bd_invalidated = 1; - } + nbd_size_update(nbd); error = wait_event_interruptible(config->recv_wq, atomic_read(&config->recv_threads) == 0); if (error)
nbd_size_update() should be called only once, not once per-connection. Move it out of the loop. Fixes: 584f48d40cbc ("nbd: don't set the device size until we're connected") Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com> --- drivers/block/nbd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)