OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: add gluster ifdef guard checks for SEEK_DATA/SEEK_HOLE support 

Add checks to see if the system compiling QEMU has support for
SEEK_HOLE/SEEK_DATA.  If the system does not, we will flag that seek
data is unsupported in gluster.

Note: this is not a check on whether the gluster server itself supports
SEEK_DATA (that is already done during runtime), but rather if the
compilation environment supports SEEK_DATA.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
Message-id: 00370bce5c98140d6c56ad5145635ec6551265cc.1475876377.git.jcody@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
This commit is contained in:
Jeff Cody 2016-10-07 17:48:12 -04:00
parent e38f643a1d
commit d9b789745b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block/gluster.c
View File

@ -668,7 +668,10 @@ static void qemu_gluster_parse_flags(int bdrv_flags, int *open_flags)
*/ */
static bool qemu_gluster_test_seek(struct glfs_fd *fd) static bool qemu_gluster_test_seek(struct glfs_fd *fd)
{ {
off_t ret, eof; off_t ret = 0;
#if defined SEEK_HOLE && defined SEEK_DATA
off_t eof;
eof = glfs_lseek(fd, 0, SEEK_END); eof = glfs_lseek(fd, 0, SEEK_END);
if (eof < 0) { if (eof < 0) {
@ -678,6 +681,8 @@ static bool qemu_gluster_test_seek(struct glfs_fd *fd)
/* this should always fail with ENXIO if SEEK_DATA is supported */ /* this should always fail with ENXIO if SEEK_DATA is supported */
ret = glfs_lseek(fd, eof, SEEK_DATA); ret = glfs_lseek(fd, eof, SEEK_DATA);
#endif
return (ret < 0) && (errno == ENXIO); return (ret < 0) && (errno == ENXIO);
} }
@ -1178,12 +1183,14 @@ static int find_allocation(BlockDriverState *bs, off_t start,
off_t *data, off_t *hole) off_t *data, off_t *hole)
{ {
BDRVGlusterState *s = bs->opaque; BDRVGlusterState *s = bs->opaque;
off_t offs;
if (!s->supports_seek_data) { if (!s->supports_seek_data) {
return -ENOTSUP; goto exit;
} }
#if defined SEEK_HOLE && defined SEEK_DATA
off_t offs;
/* /*
* SEEK_DATA cases: * SEEK_DATA cases:
* D1. offs == start: start is in data * D1. offs == start: start is in data
@ -1247,6 +1254,10 @@ static int find_allocation(BlockDriverState *bs, off_t start,
/* D1 and H1 */ /* D1 and H1 */
return -EBUSY; return -EBUSY;
#endif
exit:
return -ENOTSUP;
} }
/* /*