From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:38930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1CHR-0003rI-37 for qemu-devel@nongnu.org; Tue, 05 Mar 2019 10:46:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1CHQ-0000Bn-Au for qemu-devel@nongnu.org; Tue, 05 Mar 2019 10:46:57 -0500 From: Niels de Vos Date: Tue, 5 Mar 2019 16:46:34 +0100 Message-Id: <20190305154634.4609-3-ndevos@redhat.com> In-Reply-To: <20190305154634.4609-1-ndevos@redhat.com> References: <20190305154634.4609-1-ndevos@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 2/2] gluster: the glfs_io_cbk callback function pointer adds pre/post stat args List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Cole Robinson , integration@gluster.org, qemu-devel@nongnu.org, 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 -- v2: correct typo in commit message (Kevin Wolf) --- block/gluster.c | 6 +++++- configure | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) 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(BlockdevOption= sGluster *gconf, /* * AIO callback routine called from GlusterFS thread. */ -static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, void *= arg) +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 diff --git a/configure b/configure index bbfe587b88..db548d9b08 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" @@ -4097,6 +4098,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, st= ruct 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" \ @@ -6903,6 +6923,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 --=20 2.20.1