From 2bad9cc40695e2a3b5bb9b5705f65d38959b63ab Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Sat, 6 Feb 2016 04:25:13 -0500 Subject: [PATCH] 2.4-dev-7 --- nfs-ganesha-2.4dev7-SAL-9p_owner.patch | 11 +++++++++++ nfs-ganesha.spec | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 nfs-ganesha-2.4dev7-SAL-9p_owner.patch diff --git a/nfs-ganesha-2.4dev7-SAL-9p_owner.patch b/nfs-ganesha-2.4dev7-SAL-9p_owner.patch new file mode 100644 index 0000000..ea55bc8 --- /dev/null +++ b/nfs-ganesha-2.4dev7-SAL-9p_owner.patch @@ -0,0 +1,11 @@ +--- nfs-ganesha-2.4-dev-7/src/SAL/9p_owner.c.orig 2016-02-06 04:16:28.354869468 -0500 ++++ nfs-ganesha-2.4-dev-7/src/SAL/9p_owner.c 2016-02-06 04:17:01.382869468 -0500 +@@ -238,7 +238,7 @@ + (uint64_t)paddr->sin_addr.s_addr; + + if (isDebug(COMPONENT_HASHTABLE)) +- LogFullDebug(COMPONENT_STATE, "rbt = %lu", res); ++ LogFullDebug(COMPONENT_STATE, "rbt = %" PRIu64 , res); + + return res; + } diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index f501c3a..4ed16eb 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -89,6 +89,7 @@ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki Source0: https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz Patch0: nfs-ganesha-2.4dev7-RPCAL-rpc_tools.patch Patch1: nfs-ganesha-2.4dev7-FSAL-FSAL_CEPHFS-mds.patch +Patch2: nfs-ganesha-2.4dev7-SAL-9p_owner.patch BuildRequires: cmake BuildRequires: bison @@ -333,6 +334,7 @@ be used with NFS-Ganesha to support Gluster rm -rf contrib/libzfswrapper %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug \