aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2019-03-05 16:46:34 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2019-07-30 15:15:46 -0500
commit86d4f40141033c0b59c45d818603d8cdc6d555ce (patch)
tree3aba8d59dae71cc353332b9f580034db8870174f /block
parent37867211d9e88d1059c24261120d6e5c46845f36 (diff)
gluster: the glfs_io_cbk callback function pointer adds pre/post stat args
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 <ndevos@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit 0e3b891fefacc0e49f3c8ffa3a753b69eb7214d2) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'block')
-rw-r--r--block/gluster.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/block/gluster.c b/block/gluster.c
index c466a56b1c..58011b954c 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -729,7 +729,11 @@ static struct glfs *qemu_gluster_init(BlockdevOptionsGluster *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 = (GlusterAIOCB *)arg;