From nobody Tue Apr 23 08:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1568130252; cv=none; d=zoho.com; s=zohoarc; b=LQCxnAUv+DkZ30blZtRxaDKTFtmVzPW+9/RQoFvSi5AS+7N8uQr3amdPdpkm14mi/saBkD7Nj+8zAsktBkzoArQUM3V0HZ6u0/UzC2IRZesEqLPz7vTJB1k97OJjFWc5o/xp+ytTvQOwnVd4x6NHdr0StKIdxCv7Q05N98IE11w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568130252; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=PSIK5YQNEVkOQa8UW3YoM7NqeXUGVZMlrwqErAl9vEc=; b=glkdp1GxiGsgq7XghIj9+ujW4uTdENj5u5fqEWvwgZFR9LwwmI/3k7ORIN5xNQ+sSd3hTGWDOlCgHUUX58cj6F/pXCtJCESBPKNU9+iyn8gBvcixt7LbHvdn/07cXuzPgrGvurNthKGGOf5mWArYAv+Rid2bcxtn4zrIZQER0ps= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568130252375653.9638556945229; Tue, 10 Sep 2019 08:44:12 -0700 (PDT) Received: from localhost ([::1]:41538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7iJP-0005Bp-8R for importer@patchew.org; Tue, 10 Sep 2019 11:44:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36164) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7iGZ-0002FQ-OE for qemu-devel@nongnu.org; Tue, 10 Sep 2019 11:41:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7iGY-0004RI-GT for qemu-devel@nongnu.org; Tue, 10 Sep 2019 11:41:15 -0400 Received: from kerio.kamp.de ([195.62.97.192]:60399) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7iGY-0004Ps-3T for qemu-devel@nongnu.org; Tue, 10 Sep 2019 11:41:14 -0400 Received: from submission.kamp.de ([195.62.97.28]) by kerio.kamp.de with ESMTPS (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) for qemu-devel@nongnu.org; Tue, 10 Sep 2019 17:41:08 +0200 Received: (qmail 7081 invoked from network); 10 Sep 2019 15:41:11 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 10 Sep 2019 15:41:11 -0000 Received: by lieven-pc (Postfix, from userid 1060) id 7A01813D850; Tue, 10 Sep 2019 17:41:11 +0200 (CEST) X-Footer: a2FtcC5kZQ== From: Peter Lieven To: qemu-block@nongnu.org Date: Tue, 10 Sep 2019 17:41:09 +0200 Message-Id: <20190910154110.6905-2-pl@kamp.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190910154110.6905-1-pl@kamp.de> References: <20190910154110.6905-1-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 195.62.97.192 Subject: [Qemu-devel] [PATCH V2 1/2] block/nfs: tear down aio before nfs_close X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Peter Lieven , qemu-stable@nongnu.org, qemu-devel@nongnu.org, ronniesahlberg@gmail.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" nfs_close is a sync call from libnfs and has its own event handler polling on the nfs FD. Avoid that both QEMU and libnfs are intefering here. CC: qemu-stable@nongnu.org Signed-off-by: Peter Lieven --- block/nfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index 0ec50953e4..2c98508275 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -390,12 +390,14 @@ static void nfs_attach_aio_context(BlockDriverState *= bs, static void nfs_client_close(NFSClient *client) { if (client->context) { + qemu_mutex_lock(&client->mutex); + aio_set_fd_handler(client->aio_context, nfs_get_fd(client->context= ), + false, NULL, NULL, NULL, NULL); + qemu_mutex_unlock(&client->mutex); if (client->fh) { nfs_close(client->context, client->fh); client->fh =3D NULL; } - aio_set_fd_handler(client->aio_context, nfs_get_fd(client->context= ), - false, NULL, NULL, NULL, NULL); nfs_destroy_context(client->context); client->context =3D NULL; } --=20 2.17.1 From nobody Tue Apr 23 08:16:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1568130175; cv=none; d=zoho.com; s=zohoarc; b=SHJO3wX8DdAlwVagDDoG4U1O+GmkyEPqhWr8WawISn/KG1lKz4dLmwFvvUt3lm8245TMQc/pgOVkafqv4i7zvGQPDT7NZlGdB0X+TmBh9am6b7HXpZ15MYZagXMvj7Uw+BhiWjHPyDRa3Uwp9lG+y7iTGpyVJf6nQt/A9mwIEiA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568130175; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ACyWtxCIqPNBx0W8SEkPeKm21SmPyvLpXMhEMrQpm/M=; b=CMBb0LMSzpr/a8fNZ4tc8Ll6yZYqnr6mb1ccIyfARuWytjZisqiFb00ZIejRZHWwkd5O3mjFnLoW7kJoXCPVNfzXjnImT/6sWjKsw6Vt+fRnk6syHLaoyvyRWCv1f2SY3EWxM5/J2N/mstJFgeNoqb1di8MWkWDOKs2xSCmZmdM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568130175379874.1323397051642; Tue, 10 Sep 2019 08:42:55 -0700 (PDT) Received: from localhost ([::1]:41506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7iI9-0003XE-PF for importer@patchew.org; Tue, 10 Sep 2019 11:42:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36165) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7iGZ-0002FR-O2 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 11:41:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7iGY-0004RD-H4 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 11:41:15 -0400 Received: from kerio.kamp.de ([195.62.97.192]:60396) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7iGY-0004Po-3W for qemu-devel@nongnu.org; Tue, 10 Sep 2019 11:41:14 -0400 Received: from submission.kamp.de ([195.62.97.28]) by kerio.kamp.de with ESMTPS (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) for qemu-devel@nongnu.org; Tue, 10 Sep 2019 17:41:08 +0200 Received: (qmail 7082 invoked from network); 10 Sep 2019 15:41:11 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 10 Sep 2019 15:41:11 -0000 Received: by lieven-pc (Postfix, from userid 1060) id 7CF2813D878; Tue, 10 Sep 2019 17:41:11 +0200 (CEST) X-Footer: a2FtcC5kZQ== From: Peter Lieven To: qemu-block@nongnu.org Date: Tue, 10 Sep 2019 17:41:10 +0200 Message-Id: <20190910154110.6905-3-pl@kamp.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190910154110.6905-1-pl@kamp.de> References: <20190910154110.6905-1-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 195.62.97.192 Subject: [Qemu-devel] [PATCH V2 2/2] block/nfs: add support for nfs_umount X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Peter Lieven , qemu-devel@nongnu.org, ronniesahlberg@gmail.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" libnfs recently added support for unmounting. Add support in Qemu too. Signed-off-by: Peter Lieven --- block/nfs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/nfs.c b/block/nfs.c index 2c98508275..f39acfdb28 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -398,6 +398,9 @@ static void nfs_client_close(NFSClient *client) nfs_close(client->context, client->fh); client->fh =3D NULL; } +#ifdef LIBNFS_FEATURE_UMOUNT + nfs_umount(client->context); +#endif nfs_destroy_context(client->context); client->context =3D NULL; } --=20 2.17.1