commit nfs-ganesha for openSUSE:Factory
Hello community, here is the log from the commit of package nfs-ganesha for openSUSE:Factory checked in at 2020-02-29 21:21:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nfs-ganesha (Old) and /work/SRC/openSUSE:Factory/.nfs-ganesha.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nfs-ganesha" Sat Feb 29 21:21:38 2020 rev:10 rq:779338 version:3.2+git0.8d07e25a7 Changes: -------- --- /work/SRC/openSUSE:Factory/nfs-ganesha/nfs-ganesha.changes 2020-01-18 12:17:03.187104222 +0100 +++ /work/SRC/openSUSE:Factory/.nfs-ganesha.new.26092/nfs-ganesha.changes 2020-02-29 21:21:45.234188711 +0100 @@ -1,0 +2,6 @@ +Thu Feb 20 17:04:53 UTC 2020 - Anthony Iliopoulos <ailiopoulos@suse.com> + +- Backported patch that fixes compilation errors with xfsprogs >= v5.3.0 + * added fix-compilation-errors-on-xfs-ioctl-syscall-structs.patch + +------------------------------------------------------------------- New: ---- fix-compilation-errors-on-xfs-ioctl-syscall-structs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-ganesha.spec ++++++ --- /var/tmp/diff_new_pack.voGDnY/_old 2020-02-29 21:21:46.242190706 +0100 +++ /var/tmp/diff_new_pack.voGDnY/_new 2020-02-29 21:21:46.246190714 +0100 @@ -118,6 +118,7 @@ URL: https://github.com/nfs-ganesha/nfs-ganesha/wiki Source: %{name}-%{version}.tar.bz2 +Patch0: fix-compilation-errors-on-xfs-ioctl-syscall-structs.patch %if 0%{?suse_version} %if 0%{?is_opensuse} @@ -492,6 +493,7 @@ %prep %setup -q +%patch0 -p1 %build export LANGUAGE=en_US.UTF-8 ++++++ fix-compilation-errors-on-xfs-ioctl-syscall-structs.patch ++++++
From 9534ade9929a143f85ad99e12786ab1a572f9233 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos <ailiopoulos@suse.com> Date: Tue, 4 Feb 2020 21:50:25 +0100 Subject: [PATCH] Fix compilation errors on xfs ioctl syscall structs
Upstream xfsprogs has removed some typedef on bulk requst ioctls as of commit b46789e2 ("xfs: remove various bulk request typedef usage"), and as such compilation fails with xfsprogs headers >= v5.3.0. Replace typedef declarations with their corresponding struct types and unbreak compilation. Change-Id: Ibb5be001b73c5d11e3f879f632b73687909f6ff9 Signed-off-by: Anthony Iliopoulos <ailiopoulos@suse.com> --- src/FSAL/FSAL_VFS/xfs/handle_syscalls.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/FSAL/FSAL_VFS/xfs/handle_syscalls.c b/src/FSAL/FSAL_VFS/xfs/handle_syscalls.c index 2f85eac99..f0975bab6 100644 --- a/FSAL/FSAL_VFS/xfs/handle_syscalls.c +++ b/FSAL/FSAL_VFS/xfs/handle_syscalls.c @@ -75,9 +75,10 @@ void display_xfs_handle(struct display_buffer *dspbuf, } \ } while (0) -static int xfs_fsal_bulkstat_inode(int fd, xfs_ino_t ino, xfs_bstat_t *bstat) +static int xfs_fsal_bulkstat_inode(int fd, xfs_ino_t ino, + struct xfs_bstat *bstat) { - xfs_fsop_bulkreq_t bulkreq; + struct xfs_fsop_bulkreq bulkreq; __u64 i = ino; bulkreq.lastip = &i; @@ -89,7 +90,7 @@ static int xfs_fsal_bulkstat_inode(int fd, xfs_ino_t ino, xfs_bstat_t *bstat) static int xfs_fsal_inode2handle(int fd, ino_t ino, vfs_file_handle_t *fh) { - xfs_bstat_t bstat; + struct xfs_bstat bstat; xfs_handle_t *hdl = (xfs_handle_t *) fh->handle_data; void *data; size_t sz; -- 2.16.4
participants (1)
-
root