From nobody Sun Feb 8 19:56:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1662384879; cv=none; d=zohomail.com; s=zohoarc; b=i0dGh4Sg+ckQv9YrCkGJjcsfPSLfaLCLdhw6WmoSMdPEN5yR63dkHKgTOU+Pz4+K4cYoZ78B99fKO255xu801W1l8G5TCclyhez3zMUTDFpgRPS4e3dwz3ieEUOXLqlHfKlt1reRAvw1BhHU+70e2mI1Vdevz6hyEc3vZGOWcxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662384879; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uZCQU2ul7Xl/v0ccOou6XTAXlQ9Tz2qS18I0ieFbjDU=; b=EBGaRBugtxihVOPzveoL66PFNvW3WDKoHeqQKseca9Kqc2qOf6USLX7fp/rGxy+FtVPpHJYV4+OkoitEWXpcQhY6Hq3AH9ddC+eDl2wUQedv806JgsoVH3t9L9j04aul+DoQDuUuAsl4HkJpjP5EJ4oB4YxTpM9bjiJgYSarAZc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1662384879551430.1932888824514; Mon, 5 Sep 2022 06:34:39 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-619-iyBXS5eVM9yDoa5rIJEldg-1; Mon, 05 Sep 2022 09:34:34 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D10C08039D0; Mon, 5 Sep 2022 13:34:31 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE2BC40CF8EF; Mon, 5 Sep 2022 13:34:31 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A3978194B97A; Mon, 5 Sep 2022 13:34:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9EAC61946A47 for ; Mon, 5 Sep 2022 13:34:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8146440D2830; Mon, 5 Sep 2022 13:34:30 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCBCA40D282E for ; Mon, 5 Sep 2022 13:34:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662384878; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=uZCQU2ul7Xl/v0ccOou6XTAXlQ9Tz2qS18I0ieFbjDU=; b=MdgiQ7I8uSqjBcJ6YlRDbyeRkoj8Jy+4PyQRVy2sEfzLHvgo+yK8UkFPT5qdldgbrX+sLJ jk+3ur7M/SjGNL8HOsrzetGw0ndYlPLqrfJKPpP0WB7KaMZU59Le19XVC8+1VKKSLDg4kV 3u0XRIHTqG2K3HST4/GX3Ms7lc+90SY= X-MC-Unique: iyBXS5eVM9yDoa5rIJEldg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/7] util: virfile: Don't use VIR_FILE_SHFS_GFS2 for glusterfs Date: Mon, 5 Sep 2022 15:34:19 +0200 Message-Id: <1815f3891d518dca4f71c1c8dea14e8eae0f0a1d.1662384799.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1662384880803100001 Content-Type: text/plain; charset="utf-8" While the code works properly as no code path is specifically wanting to check for glusterfs, we should properly declare glusterfs as a separate from GFS2. Fixes: 478da65fb46 Signed-off-by: Peter Krempa --- src/util/virfile.c | 8 +++++--- src/util/virfile.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 33a3ffe8f7..f5a61abd9f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3331,7 +3331,7 @@ struct virFileSharedFsData { }; static const struct virFileSharedFsData virFileSharedFsFUSE[] =3D { - { .mnttype =3D "fuse.glusterfs", .fstype =3D VIR_FILE_SHFS_GFS2 }, + { .mnttype =3D "fuse.glusterfs", .fstype =3D VIR_FILE_SHFS_GLUSTERFS }, { .mnttype =3D "fuse.quobyte", .fstype =3D VIR_FILE_SHFS_QB }, }; @@ -3668,7 +3668,8 @@ int virFileIsSharedFS(const char *path) VIR_FILE_SHFS_CEPH | VIR_FILE_SHFS_GPFS| VIR_FILE_SHFS_QB | - VIR_FILE_SHFS_ACFS); + VIR_FILE_SHFS_ACFS | + VIR_FILE_SHFS_GLUSTERFS); } @@ -3681,7 +3682,8 @@ virFileIsClusterFS(const char *path) return virFileIsSharedFSType(path, VIR_FILE_SHFS_GFS2 | VIR_FILE_SHFS_OCFS | - VIR_FILE_SHFS_CEPH); + VIR_FILE_SHFS_CEPH | + VIR_FILE_SHFS_GLUSTERFS); } diff --git a/src/util/virfile.h b/src/util/virfile.h index c4d11ea21a..f7a31d9f57 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -222,6 +222,7 @@ enum { VIR_FILE_SHFS_GPFS =3D (1 << 7), /* General Parallel File System/IBM S= pectrum Scale */ VIR_FILE_SHFS_QB =3D (1 << 8), /* Quobyte shared filesystem */ VIR_FILE_SHFS_ACFS =3D (1 << 9), /* Oracle ASM Cluster File System */ + VIR_FILE_SHFS_GLUSTERFS =3D (1 << 10), /* gluster's FUSE-based client = */ }; int virFileIsSharedFSType(const char *path, unsigned int fstypes) ATTRIBUT= E_NONNULL(1); --=20 2.37.1