Ceph restored in EPEL

- Fedora 23/rawhide build fixes

nfs-ganesha-2.1.0-cache_inode.patch

@@ -0,0 +1,19 @@
+*** nfs-ganesha-2.1.0/src/include/cache_inode.h.orig	2015-02-12 11:12:22.218718318 -0500
+--- nfs-ganesha-2.1.0/src/include/cache_inode.h	2015-02-12 11:12:37.967718318 -0500
+***************
+*** 879,885 ****
+  cache_inode_status_t cache_inode_invalidate(cache_entry_t *entry,
+  					    uint32_t flags);
+  
+! inline int cache_inode_set_time_current(struct timespec *time);
+  
+  void cache_inode_destroyer(void);
+  
+--- 879,885 ----
+  cache_inode_status_t cache_inode_invalidate(cache_entry_t *entry,
+  					    uint32_t flags);
+  
+! int cache_inode_set_time_current(struct timespec *time);
+  
+  void cache_inode_destroyer(void);
+  

nfs-ganesha-2.1.0-state_lock.patch

@@ -0,0 +1,21 @@
+*** nfs-ganesha-2.1.0/src/SAL/state_lock.c.orig	2015-02-12 11:44:24.233718318 -0500
+--- nfs-ganesha-2.1.0/src/SAL/state_lock.c	2015-02-12 11:45:06.679718318 -0500
+***************
+*** 611,618 ****
+   *
+   * @return New entry or NULL.
+   */
+! inline state_lock_entry_t *state_lock_entry_t_dup(state_lock_entry_t *
+! 						  orig_entry)
+  {
+  	return create_state_lock_entry(orig_entry->sle_entry,
+  				       orig_entry->sle_export,
+--- 611,618 ----
+   *
+   * @return New entry or NULL.
+   */
+! static inline state_lock_entry_t *state_lock_entry_t_dup(state_lock_entry_t *
+! 							 orig_entry)
+  {
+  	return create_state_lock_entry(orig_entry->sle_entry,
+  				       orig_entry->sle_export,

nfs-ganesha.spec

@@ -15,10 +15,7 @@
 %global            with_glusterfs true
 %endif
 
-# Ceph is not available in EPEL 7
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} < 7 )
 %global            with_cephfs true
-%endif
 
 %global            with_admintools true
 
@@ -49,6 +46,8 @@ Patch9:            nfs-ganesha-2.1.0-config-h.in.cmake.patch
 Patch10:           nfs-ganesha-2.1.0-commonlib.patch
 Patch11:           nfs-ganesha-2.1.0-nfs4_op_secinfo.patch
 Patch12:           nfs-ganesha-2.1.0-support-CMakeLists.txt.patch
+Patch13:           nfs-ganesha-2.1.0-cache_inode.patch
+Patch14:           nfs-ganesha-2.1.0-state_lock.patch
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
@@ -179,6 +178,8 @@ mv %{ntirpcname}-%{ntirpcvers}/* src/libntirpc/
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
@@ -265,6 +266,10 @@ install -D -p -m 0644 src/scripts/ganeshactl/org.ganesha.nfsd.conf %{buildroot}%
 %dir %{_pkgdocdir}
 
 %changelog
+* Thu Feb 12 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-14
+- Ceph restored in EPEL
+- Fedora 23/rawhide build fixes
+
 * Mon Jan 19 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-13
 - Ceph retired from EPEL 7