sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

vfs_glusterfs: Adapt to changes in libgfapi signatures

Browse Source 
VFS module for GlusterFS fails to compile due to recent changes done to
some API signatures. Therefore adding missing arguments to those APIs
adapting to new signatures.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13330

Signed-off-by: Anoop C S <anoopcs@redhat.com>
Reviewed-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sun Feb  3 17:00:33 CET 2019 on sn-devel-144

(cherry picked from commit 0e3eda5bab5ae9316a42725aea048fb350020ec7)
This commit is contained in:
Anoop C S 2018-03-20 11:32:20 +05:30 committed by Karolin Seeger
parent 6ddc44fbb7
commit 3477e19d74
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/modules/vfs_glusterfs.c
View File

@ -628,7 +628,11 @@ static ssize_t vfs_gluster_pread(struct vfs_handle_struct *handle,
return -1;
}
#ifdef HAVE_GFAPI_VER_7_6
return glfs_pread(glfd, data, n, offset, 0, NULL);
#else
return glfs_pread(glfd, data, n, offset, 0);
#endif
}
struct glusterfs_aio_state;
@ -659,7 +663,14 @@ static int aio_wrapper_destructor(struct glusterfs_aio_wrapper *wrap)
* threads once the async IO submitted is complete. To notify
* Samba of the completion we use a pipe based queue.
*/
#ifdef HAVE_GFAPI_VER_7_6
static void aio_glusterfs_done(glfs_fd_t *fd, ssize_t ret,
struct glfs_stat *prestat,
struct glfs_stat *poststat,
void *data)
#else
static void aio_glusterfs_done(glfs_fd_t *fd, ssize_t ret, void *data)
#endif
{
struct glusterfs_aio_state *state = NULL;
int sts = 0;
@ -958,7 +969,11 @@ static ssize_t vfs_gluster_pwrite(struct vfs_handle_struct *handle,
return -1;
}
#ifdef HAVE_GFAPI_VER_7_6
return glfs_pwrite(glfd, data, n, offset, 0, NULL, NULL);
#else
return glfs_pwrite(glfd, data, n, offset, 0);
#endif
}
static off_t vfs_gluster_lseek(struct vfs_handle_struct *handle,
@ -1243,7 +1258,11 @@ static int vfs_gluster_ftruncate(struct vfs_handle_struct *handle,
return -1;
}
#ifdef HAVE_GFAPI_VER_7_6
return glfs_ftruncate(glfd, offset, NULL, NULL);
#else
return glfs_ftruncate(glfd, offset);
#endif
}
static int vfs_gluster_fallocate(struct vfs_handle_struct *handle,

3
source3/wscript
View File

@ -1568,6 +1568,9 @@ main() {
conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 6" --cflags --libs',
msg='Checking for glusterfs-api >= 6',
uselib_store="GFAPI_VER_6")
conf.CHECK_CFG(package='glusterfs-api', args='"glusterfs-api >= 7.6" --cflags --libs',
msg='Checking for glusterfs-api >= 7.6',
uselib_store="GFAPI_VER_7_6")
else:
conf.SET_TARGET_TYPE('gfapi', 'EMPTY')
conf.undefine('HAVE_GLUSTERFS')