From fc2cc6affa5978b0c3257ce5f95c2b829c9ec178 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Sat, 6 Feb 2016 01:43:45 -0500 Subject: [PATCH] 2.4-dev-7 --- ...ganesha-2.4dev7-FSAL-FSAL_CEPHFS-mds.patch | 34 +++++++++++++++++++ nfs-ganesha.spec | 4 ++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 nfs-ganesha-2.4dev7-FSAL-FSAL_CEPHFS-mds.patch diff --git a/nfs-ganesha-2.4dev7-FSAL-FSAL_CEPHFS-mds.patch b/nfs-ganesha-2.4dev7-FSAL-FSAL_CEPHFS-mds.patch new file mode 100644 index 0000000..4ce0ef0 --- /dev/null +++ b/nfs-ganesha-2.4dev7-FSAL-FSAL_CEPHFS-mds.patch @@ -0,0 +1,34 @@ +--- nfs-ganesha-2.4-dev-7/src/FSAL/FSAL_CEPH/internal.h.orig 2016-02-06 01:14:25.567869468 -0500 ++++ nfs-ganesha-2.4-dev-7/src/FSAL/FSAL_CEPH/internal.h 2016-02-06 01:15:51.655869468 -0500 +@@ -123,14 +123,6 @@ + extern attrmask_t settable_attributes; + #endif /* !CEPH_INTERNAL_C */ + +-/** +- * Linux supports a stripe pattern with no more than 4096 stripes, but +- * for now we stick to 1024 to keep them da_addrs from being too +- * gigantic. +- */ +- +-static const size_t BIGGEST_PATTERN = 1024; +- + /* private helper for export object */ + + static inline fsal_staticfsinfo_t *ceph_staticinfo(struct fsal_module *hdl) +--- nfs-ganesha-2.4-dev-7/src/FSAL/FSAL_CEPH/mds.c.orig 2016-02-06 01:15:20.154869468 -0500 ++++ nfs-ganesha-2.4-dev-7/src/FSAL/FSAL_CEPH/mds.c 2016-02-06 01:36:01.443869468 -0500 +@@ -34,6 +34,14 @@ + #ifdef CEPH_PNFS + + /** ++ * Linux supports a stripe pattern with no more than 4096 stripes, but ++ * for now we stick to 1024 to keep them da_addrs from being too ++ * gigantic. ++ */ ++ ++static const size_t BIGGEST_PATTERN = 1024; ++ ++/** + * @file FSAL_CEPH/mds.c + * @author Adam C. Emerson + * @date Wed Oct 22 13:24:33 2014 diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 5f8e0ff..f501c3a 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -80,7 +80,7 @@ Name: nfs-ganesha Version: 2.4.0 %global dev dev7 %global dash_dev_version 2.4-dev-7 -Release: 0%{?dev:%{dev}}%{?dist} +Release: 0.1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -88,6 +88,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 BuildRequires: cmake BuildRequires: bison @@ -331,6 +332,7 @@ be used with NFS-Ganesha to support Gluster %setup -q -n %{name}-%{dash_dev_version} rm -rf contrib/libzfswrapper %patch0 -p1 +%patch1 -p1 %build cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug \