57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
|
From 247987aa987b7332eb501e00c440079b9e8e1fe7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
||
|
|
Date: Mon, 27 Jan 2020 19:00:52 +0100
|
||
|
|
Subject: [PATCH 021/116] vitriofsd/passthrough_ll: fix fallocate() ifdefs
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
Message-id: <20200127190227.40942-18-dgilbert@redhat.com>
|
||
|
|
Patchwork-id: 93471
|
||
|
|
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 017/112] vitriofsd/passthrough_ll: fix fallocate() ifdefs
|
||
|
|
Bugzilla: 1694164
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
|
||
|
|
|
||
|
|
From: Xiao Yang <yangx.jy@cn.fujitsu.com>
|
||
|
|
|
||
|
|
1) Use correct CONFIG_FALLOCATE macro to check if fallocate() is supported.(i.e configure
|
||
|
|
script sets CONFIG_FALLOCATE intead of HAVE_FALLOCATE if fallocate() is supported)
|
||
|
|
2) Replace HAVE_POSIX_FALLOCATE with CONFIG_POSIX_FALLOCATE.
|
||
|
|
|
||
|
|
Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
|
||
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
Merged from two of Xiao Yang's patches
|
||
|
|
(cherry picked from commit 9776457ca6f05d5900e27decb1dba2ffddf95a22)
|
||
|
|
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
---
|
||
|
|
tools/virtiofsd/passthrough_ll.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
|
||
|
|
index 322a889..6c4da18 100644
|
||
|
|
--- a/tools/virtiofsd/passthrough_ll.c
|
||
|
|
+++ b/tools/virtiofsd/passthrough_ll.c
|
||
|
|
@@ -975,13 +975,13 @@ static void lo_fallocate(fuse_req_t req, fuse_ino_t ino, int mode, off_t offset,
|
||
|
|
int err = EOPNOTSUPP;
|
||
|
|
(void)ino;
|
||
|
|
|
||
|
|
-#ifdef HAVE_FALLOCATE
|
||
|
|
+#ifdef CONFIG_FALLOCATE
|
||
|
|
err = fallocate(fi->fh, mode, offset, length);
|
||
|
|
if (err < 0) {
|
||
|
|
err = errno;
|
||
|
|
}
|
||
|
|
|
||
|
|
-#elif defined(HAVE_POSIX_FALLOCATE)
|
||
|
|
+#elif defined(CONFIG_POSIX_FALLOCATE)
|
||
|
|
if (mode) {
|
||
|
|
fuse_reply_err(req, EOPNOTSUPP);
|
||
|
|
return;
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|