Message ID | 201910181136.x9IBauHo020452@finist_el8beta.work.ct |
---|---|
State | New |
Series | "ploop: Cancel backup timer before target destruction" |
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); Fri, 18 Oct 2019 13:38:56 +0200 (CEST) Received: by 2002:a6b:a16:0:0:0:0:0 with SMTP id z22csp579485ioi; Fri, 18 Oct 2019 04:38:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqzkHuft2jH+qbYANwn0Bfu7gTLc1vNG1zNqIzbKBqYWqn0Nn8ELbLHBEcht2DiP6+YjAHr0 X-Received: by 2002:a2e:a166:: with SMTP id u6mr5910118ljl.209.1571398730051; Fri, 18 Oct 2019 04:38:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571398730; cv=none; d=google.com; s=arc-20160816; b=AoFZr1haip4XrXrertynlHZn5r20+a/1XQggu6ErzSvsWY0s8ZANTuQ1VpckpxFOpM PfA06qRcgUf92OMAwlF8R3zPBdZVELAHukrAdkU+ICDbkuJY1ML3oMU5U66r7ogpZCKL o0rXgmAjAQdpZAyY1lpMaVlYpJtrQhe7WrAcq2wVeN0YARa8f1gVBs04y3yDDtWlYntE EhfXwmJ5ZIAL7FQnZGxuv726R8wRilFw28XFG1J/D9yvVCLudxRi+axUMEVeAK48JFD5 rYGRBthdtxrDVNmh5L6un6iVsvYSAZhMvVYGUcIOQeJ2ApSkod5I88oah84ug05s5yUq iSmw== 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 :cc:mime-version:content-language:accept-language:in-reply-to :message-id:date:thread-index:thread-topic:to:from; bh=vWHqMZBDO8uWDFzjsJ2dItEsaOU1XUCx2iD/gGavRwI=; b=mTtaUGKS738anAQvsroPz+EjFPLsTAEUwgOFLc5q2ZHwdhtrvczNIrCb8GAVT+vDHl zYjlRn/MClwccPcA98VrKXQ1WEpNgFiY/LGo3vtfMqRqQ0UCmRKhZwMjB32aYCgtgmgv 6FwVHUwsKlQ8DZ6yyH3x5SVY7oY3D16YGvtJio32RQ/VmX10hzSHQxX7BuANgGcvm354 Rrp5MAnncWW8sCf5HQIpwtIUsZWj+VnNG+IxcijOZP15eRZcqkfqme8xfAlKggVWeANY liG53/OZkdlDV0+NchcIOP7qz6DBMPrigkpGAhiydbnwnXWt6QokGyD10SthfoeZsIWb GRVQ== 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 a14si4891345ljk.208.2019.10.18.04.38.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Oct 2019 04:38:50 -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 x9IBauwr008859; Fri, 18 Oct 2019 14:36:56 +0300 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2056.outbound.protection.outlook.com [104.47.6.56]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id x9IBasnK008854 for <devel@openvz.org>; Fri, 18 Oct 2019 14:36:54 +0300 Received: from AM0PR08MB3156.eurprd08.prod.outlook.com (52.134.125.33) by AM0PR08MB3539.eurprd08.prod.outlook.com (20.177.110.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2347.18; Fri, 18 Oct 2019 11:36:58 +0000 Received: from AM0PR08MB3156.eurprd08.prod.outlook.com ([fe80::7006:3ddf:6cbd:40ab]) by AM0PR08MB3156.eurprd08.prod.outlook.com ([fe80::7006:3ddf:6cbd:40ab%6]) with mapi id 15.20.2347.024; Fri, 18 Oct 2019 11:36:58 +0000 From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Kirill Tkhai <ktkhai@virtuozzo.com> Thread-Topic: [PATCH RHEL8 COMMIT] ploop: Cancel backup timer before target destruction Thread-Index: AQHVhahZ91cEPTAgdk6Gj/a4BQ6JEQ== Date: Fri, 18 Oct 2019 11:36:58 +0000 Message-ID: <201910181136.x9IBauHo020452@finist_el8beta.work.ct> In-Reply-To: <157139616266.13584.18221561346986294266.stgit@localhost.localdomain> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0335.eurprd05.prod.outlook.com (2603:10a6:7:92::30) To AM0PR08MB3156.eurprd08.prod.outlook.com (2603:10a6:208:64::33) authentication-results: openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=virtuozzo.com; x-ms-exchange-messagesentrepresentingtype: 1 x-authentication-warning: finist_el8beta.work.ct: khorenko set sender to khorenko@virtuozzo.com using -f x-originating-ip: [185.231.240.5] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7dc2b883-f8a1-4d58-4dd4-08d753bf7c0f x-ms-traffictypediagnostic: AM0PR08MB3539:|AM0PR08MB3539: x-ms-exchange-purlcount: 1 x-ms-exchange-transport-forked: True x-ms-oob-tlc-oobclassifiers: OLM:59; x-forefront-antispam-report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:AM0PR08MB3539; H:AM0PR08MB3156.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 62PqEAA6ejUrNQL5NH22/i58G1Ceb42kvxO6K2d0WASISY+V/SZD4YaSvQDw8CdlgMmpnIVGHyQkGVhGrS7uzxDnxG4ArciBFO3jka4hQLk+iem9lfsYzNhfVkCsHKCcLsMCTNVSmQkV3HKEAn3xPgGJPVfW7CgcG3HPD/K/WbQdJKWkqONqG+KigRhsg/INxB0fYlet+4kwtcneorVmBZ+fXNyiImil4IeRbvOzL6QKdqgqYTlbCybLfijRM1GDVL+zthUZ9C35JNFoYn2+P89Oi4djAUlkVqqoLFKX4sNcNwKgS7XKHUKHyapAhGEdbWVNXOSti++laP0d6ONAvospVjbDL5uK5d6ou51ErALHxtOPJeJzhYTbcbCeSP3zJ9SN4XrI6nBdhF6q6Rt1SGiIIAkUpgJjtwbwlDaKZsU= MIME-Version: 1.0 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7dc2b883-f8a1-4d58-4dd4-08d753bf7c0f X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Oct 2019 11:36:58.2860 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: zAxCoTmz0t4ZhkEjd7TdRSuw13BBGfZ4aZe75QEADNplwWJKfAA4NHWfQLzBtBKsGn+NLLb2WSyFDpU2BDRfew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3539 X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 X-MS-Exchange-CrossPremises-AuthSource: AM0PR08MB3156.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-mapi-admin-submission: X-MS-Exchange-CrossPremises-messagesource: StoreDriver X-MS-Exchange-CrossPremises-BCC: X-MS-Exchange-CrossPremises-originalclientipaddress: 185.231.240.5 X-MS-Exchange-CrossPremises-transporttraffictype: Email X-MS-Exchange-CrossPremises-transporttrafficsubtype: X-MS-Exchange-CrossPremises-antispam-scancontext: DIR:Originating; SFV:SKI; SKIP:0; X-MS-Exchange-CrossPremises-processed-by-journaling: Journal Agent X-OrganizationHeadersPreserved: AM0PR08MB3539.eurprd08.prod.outlook.com X-MIME-Autoconverted: from quoted-printable to 8bit by mail.openvz.org id x9IBasnK008854 Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL8 COMMIT] ploop: Cancel backup timer before target destruction 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/md/dm-ploop-target.c b/drivers/md/dm-ploop-target.c index 69c215e1bc66..a5abcac11c14 100644 --- a/drivers/md/dm-ploop-target.c +++ b/drivers/md/dm-ploop-target.c @@ -46,8 +46,10 @@ static void ploop_destroy(struct ploop *ploop) { int i; - if (ploop->pb) + if (ploop->pb) { + cleanup_backup(ploop); ploop_free_pb(ploop->pb); + } if (ploop->wq) { ploop_flush_workqueue(ploop); destroy_workqueue(ploop->wq);
The commit is pushed to "branch-rh8-4.18.0-80.1.2.vz8.2.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh8-4.18.0-80.1.2.vz8.2.2 ------> commit 3dfab2aa292da8c101167ba2c3165ea4211796da Author: Kirill Tkhai <ktkhai@virtuozzo.com> Date: Fri Oct 18 14:36:56 2019 +0300 ploop: Cancel backup timer before target destruction ... and also queue delayed bios back. Otherwise, it fires after memory is freed. Fixes: 398e0c85e871 ("dm: Interpreter of ploop1 format (ploop driver)") Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- drivers/md/dm-ploop-target.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)