AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

cursor/os-compatibility: move resizing into a separate function

Browse Source 
Signed-off-by: Jan Beich <jbeich@FreeBSD.org>
This commit is contained in:
Jan Beich 2020-02-16 05:54:33 +00:00
parent 3a3dd0820d
commit 230885ebb4
3 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cursor/os-compatibility.c
View File

@ -119,7 +119,6 @@ os_create_anonymous_file(off_t size)
const char *path;
char *name;
int fd;
int ret;
#ifdef HAVE_MEMFD_CREATE
fd = memfd_create("wayland-cursor", MFD_CLOEXEC | MFD_ALLOW_SEALING);
@ -155,25 +154,30 @@ os_create_anonymous_file(off_t size)
return -1;
}
#ifdef HAVE_POSIX_FALLOCATE
/*
* Filesystems that do support fallocate will return EINVAL or
* EOPNOTSUPP. In this case we need to fall back to ftruncate
*/
ret = posix_fallocate(fd, 0, size);
if (ret == 0) {
return fd;
} else if (ret != EINVAL && ret != EOPNOTSUPP) {
close(fd);
errno = ret;
return -1;
}
#endif
ret = ftruncate(fd, size);
if (ret < 0) {
if (os_resize_anonymous_file(fd, size) < 0) {
close(fd);
return -1;
}
return fd;
}
int
os_resize_anonymous_file(int fd, off_t size)
{
#ifdef HAVE_POSIX_FALLOCATE
/*
* Filesystems that do support fallocate will return EINVAL or
* EOPNOTSUPP. In this case we need to fall back to ftruncate
*/
errno = posix_fallocate(fd, 0, size);
if (errno == 0)
return 0;
else if (errno != EINVAL && errno != EOPNOTSUPP)
return -1;
#endif
if (ftruncate(fd, size) < 0)
return -1;
return 0;
}

3
cursor/os-compatibility.h
View File

@ -31,4 +31,7 @@
int
os_create_anonymous_file(off_t size);
int
os_resize_anonymous_file(int fd, off_t size);
#endif /* OS_COMPATIBILITY_H */

12
cursor/wayland-cursor.c
View File

@ -83,17 +83,7 @@ err_free:
static int
shm_pool_resize(struct shm_pool *pool, int size)
{
#ifdef HAVE_POSIX_FALLOCATE
/*
* Filesystems that do support fallocate will return EINVAL or
* EOPNOTSUPP. In this case we need to fall back to ftruncate
*/
errno = posix_fallocate(pool->fd, 0, size);
if (errno != 0 && errno != EINVAL && errno != EOPNOTSUPP)
return 0;
#endif
if (ftruncate(pool->fd, size) < 0)
if (os_resize_anonymous_file(pool->fd, size) < 0)
return 0;
wl_shm_pool_resize(pool->pool, size);