From nobody Thu Dec 18 17:53:31 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552413589307660.2064707275385; Tue, 12 Mar 2019 10:59:49 -0700 (PDT) Received: from localhost ([127.0.0.1]:56860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lgo-0008Ay-Af for importer@patchew.org; Tue, 12 Mar 2019 13:59:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3lEg-0000ka-AX for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:30:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3lEe-0008KN-85 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:30:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40988) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3lEa-0008FH-6R; Tue, 12 Mar 2019 13:30:36 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 47B3188283; Tue, 12 Mar 2019 17:30:35 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35C9D60BF7; Tue, 12 Mar 2019 17:30:34 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 12 Mar 2019 18:29:59 +0100 Message-Id: <20190312173025.3843-3-kwolf@redhat.com> In-Reply-To: <20190312173025.3843-1-kwolf@redhat.com> References: <20190312173025.3843-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 12 Mar 2019 17:30:35 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 02/28] gluster: the glfs_io_cbk callback function pointer adds pre/post stat args X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Niels de Vos The glfs_*_async() functions do a callback once finished. This callback has changed its arguments, pre- and post-stat structures have been added. This makes it possible to improve caching, which is useful for Samba and NFS-Ganesha, but not so much for QEMU. Gluster 6 is the first release that includes these new arguments. With an additional detection in ./configure, the new arguments can conditionally get included in the glfs_io_cbk handler. Signed-off-by: Niels de Vos Signed-off-by: Kevin Wolf --- configure | 24 ++++++++++++++++++++++++ block/gluster.c | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 5354d51930..45a3654c5b 100755 --- a/configure +++ b/configure @@ -457,6 +457,7 @@ glusterfs_discard=3D"no" glusterfs_fallocate=3D"no" glusterfs_zerofill=3D"no" glusterfs_ftruncate_has_stat=3D"no" +glusterfs_iocb_has_stat=3D"no" gtk=3D"" gtk_gl=3D"no" tls_priority=3D"NORMAL" @@ -4105,6 +4106,25 @@ EOF if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then glusterfs_ftruncate_has_stat=3D"yes" fi + cat > $TMPC << EOF +#include + +/* new glfs_io_cbk() passes two additional glfs_stat structs */ +static void +glusterfs_iocb(glfs_fd_t *fd, ssize_t ret, struct glfs_stat *prestat, stru= ct glfs_stat *poststat, void *data) +{} + +int +main(void) +{ + glfs_io_cbk iocb =3D &glusterfs_iocb; + iocb(NULL, 0 , NULL, NULL, NULL); + return 0; +} +EOF + if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then + glusterfs_iocb_has_stat=3D"yes" + fi else if test "$glusterfs" =3D "yes" ; then feature_not_found "GlusterFS backend support" \ @@ -6994,6 +7014,10 @@ if test "$glusterfs_ftruncate_has_stat" =3D "yes" ; = then echo "CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT=3Dy" >> $config_host_mak fi =20 +if test "$glusterfs_iocb_has_stat" =3D "yes" ; then + echo "CONFIG_GLUSTERFS_IOCB_HAS_STAT=3Dy" >> $config_host_mak +fi + if test "$libssh2" =3D "yes" ; then echo "CONFIG_LIBSSH2=3Dm" >> $config_host_mak echo "LIBSSH2_CFLAGS=3D$libssh2_cflags" >> $config_host_mak diff --git a/block/gluster.c b/block/gluster.c index f853aa87f4..51f184cbd8 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -729,7 +729,11 @@ static struct glfs *qemu_gluster_init(BlockdevOptionsG= luster *gconf, /* * AIO callback routine called from GlusterFS thread. */ -static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, void *ar= g) +static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, +#ifdef CONFIG_GLUSTERFS_IOCB_HAS_STAT + struct glfs_stat *pre, struct glfs_stat *= post, +#endif + void *arg) { GlusterAIOCB *acb =3D (GlusterAIOCB *)arg; =20 --=20 2.20.1