This commit is contained in:
Kaleb S. KEITHLEY 2016-09-01 14:01:11 -04:00
parent fa3f3eea69
commit 1271f67f1e
1 changed files with 10 additions and 50 deletions

View File

@ -1,60 +1,20 @@
--- nfs-ganesha-2.4-rc1/src/FSAL/FSAL_CEPH/handle.c.orig 2016-08-29 12:24:44.350041751 -0400
+++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_CEPH/handle.c 2016-08-29 12:24:52.429041751 -0400
@@ -31,9 +31,7 @@
+++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_CEPH/handle.c 2016-08-29 13:42:12.502041751 -0400
@@ -31,6 +31,7 @@
* fsal_obj_handle type.
*/
-#ifdef LINUX
+#include "config.h"
#ifdef LINUX
#include <sys/sysmacros.h> /* for makedev(3) */
-#endif
#include <fcntl.h>
#include <cephfs/libcephfs.h>
#include "fsal.h"
#endif
--- nfs-ganesha-2.4-rc1/src/FSAL/FSAL_GLUSTER/handle.c.orig 2016-08-29 12:25:01.223041751 -0400
+++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_GLUSTER/handle.c 2016-08-29 12:25:07.761041751 -0400
@@ -21,9 +21,7 @@
+++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_GLUSTER/handle.c 2016-08-29 13:42:34.090041751 -0400
@@ -21,6 +21,7 @@
* -------------
*/
-#ifdef LINUX
+#include "config.h"
#ifdef LINUX
#include <sys/sysmacros.h> /* for makedev(3) */
-#endif
#include <fcntl.h>
#include "fsal.h"
#include "gluster_internal.h"
--- nfs-ganesha-2.4-rc1/src/FSAL/FSAL_VFS/handle.c.orig 2016-08-29 12:25:14.822041751 -0400
+++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_VFS/handle.c 2016-08-29 12:25:21.980041751 -0400
@@ -32,9 +32,7 @@
#include "config.h"
-#ifdef LINUX
#include <sys/sysmacros.h> /* for makedev(3) */
-#endif
#include <libgen.h> /* used for 'dirname' */
#include <pthread.h>
#include <string.h>
--- nfs-ganesha-2.4-rc1/src/FSAL/fsal_convert.c.orig 2016-08-29 12:24:12.086041751 -0400
+++ nfs-ganesha-2.4-rc1/src/FSAL/fsal_convert.c 2016-08-29 12:25:41.084041751 -0400
@@ -9,9 +9,7 @@
*/
#include "config.h"
-#ifdef LINUX
#include <sys/sysmacros.h> /* for major(3), minor(3) */
-#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
--- nfs-ganesha-2.4-rc1/src/FSAL/commonlib.c.orig 2016-08-29 12:23:57.398041751 -0400
+++ nfs-ganesha-2.4-rc1/src/FSAL/commonlib.c 2016-08-29 12:25:37.686041751 -0400
@@ -41,9 +41,7 @@
#include "config.h"
#include <misc/queue.h> /* avoid conflicts with sys/queue.h */
-#ifdef LINUX
#include <sys/sysmacros.h> /* for major(3), minor(3) */
-#endif
#include <libgen.h> /* used for 'dirname' */
#include <pthread.h>
#include <sys/stat.h>
#endif