From 3a3dd0820de331d560af954bf9d786c1256ec577 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 15 Feb 2020 15:16:51 +0000 Subject: [PATCH] cursor: ignore posix_fallocate in shm_pool_resize if not supported by FS Signed-off-by: Jan Beich --- cursor/wayland-cursor.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cursor/wayland-cursor.c b/cursor/wayland-cursor.c index d40c5c8e..ca5be8dd 100644 --- a/cursor/wayland-cursor.c +++ b/cursor/wayland-cursor.c @@ -83,15 +83,19 @@ err_free: static int shm_pool_resize(struct shm_pool *pool, int size) { - if (ftruncate(pool->fd, size) < 0) - return 0; - #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) + if (errno != 0 && errno != EINVAL && errno != EOPNOTSUPP) return 0; #endif + if (ftruncate(pool->fd, size) < 0) + return 0; + wl_shm_pool_resize(pool->pool, size); munmap(pool->data, pool->size);