1 files changed, 52 insertions, 44 deletions

diff --git a/contrib/amd/include/mount_headers1.h b/contrib/amd/include/mount_headers1.h
index 41f26e5..7d518a0 100644
--- a/contrib/amd/include/mount_headers1.h
+++ b/contrib/amd/include/mount_headers1.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2006 Erez Zadok
+ * Copyright (c) 1997-2014 Erez Zadok
  * Copyright (c) 1990 Jan-Simon Pendry
  * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1990 The Regents of the University of California.
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -123,50 +119,50 @@
 # include <sys/vmount.h>
 #endif /* HAVE_SYS_VMOUNT_H */
 
-/*
- * There is no point in including this on a glibc2 system
- * we're only asking for trouble
- */
-#if defined HAVE_LINUX_FS_H && (!defined __GLIBC__ || __GLIBC__ < 2)
+#if HAVE_LINUX_FS_H
+# if !defined(__GLIBC__) || __GLIBC__ < 2
 /*
  * There's a conflict of definitions on redhat alpha linux between
  * <netinet/in.h> and <linux/fs.h>.
  * Also a conflict in definitions of ntohl/htonl in RH-5.1 sparc64
  * between <netinet/in.h> and <linux/byteorder/generic.h> (2.1 kernels).
  */
-# ifdef HAVE_SOCKETBITS_H
-#  define _LINUX_SOCKET_H
-#  undef BLKFLSBUF
-#  undef BLKGETSIZE
-#  undef BLKRAGET
-#  undef BLKRASET
-#  undef BLKROGET
-#  undef BLKROSET
-#  undef BLKRRPART
-#  undef MS_MGC_VAL
-#  undef MS_RMT_MASK
-# endif /* HAVE_SOCKETBITS_H */
-# ifdef HAVE_LINUX_POSIX_TYPES_H
-#  include <linux/posix_types.h>
-# endif /* HAVE_LINUX_POSIX_TYPES_H */
-# ifndef _LINUX_BYTEORDER_GENERIC_H
-#  define _LINUX_BYTEORDER_GENERIC_H
-# endif /* _LINUX_BYTEORDER_GENERIC_H */
-# ifndef _LINUX_STRING_H_
-#  define _LINUX_STRING_H_
-# endif /* not _LINUX_STRING_H_ */
-# ifdef HAVE_LINUX_KDEV_T_H
-#  define __KERNEL__
-#  include <linux/kdev_t.h>
-#  undef __KERNEL__
-# endif /* HAVE_LINUX_KDEV_T_H */
-# ifdef HAVE_LINUX_LIST_H
-#  define __KERNEL__
-#  include <linux/list.h>
-#  undef __KERNEL__
-# endif /* HAVE_LINUX_LIST_H */
-# include <linux/fs.h>
-#endif /* HAVE_LINUX_FS_H && (!__GLIBC__ || __GLIBC__ < 2) */
+#  ifdef HAVE_SOCKETBITS_H
+#   define _LINUX_SOCKET_H
+#   undef BLKFLSBUF
+#   undef BLKGETSIZE
+#   undef BLKRAGET
+#   undef BLKRASET
+#   undef BLKROGET
+#   undef BLKROSET
+#   undef BLKRRPART
+#   undef MS_MGC_VAL
+#   undef MS_RMT_MASK
+#  endif /* HAVE_SOCKETBITS_H */
+#  ifdef HAVE_LINUX_POSIX_TYPES_H
+#   include <linux/posix_types.h>
+#  endif /* HAVE_LINUX_POSIX_TYPES_H */
+#  ifndef _LINUX_BYTEORDER_GENERIC_H
+#   define _LINUX_BYTEORDER_GENERIC_H
+#  endif /* _LINUX_BYTEORDER_GENERIC_H */
+#  ifndef _LINUX_STRING_H_
+#   define _LINUX_STRING_H_
+#  endif /* not _LINUX_STRING_H_ */
+#  ifdef HAVE_LINUX_KDEV_T_H
+#   define __KERNEL__
+#   include <linux/kdev_t.h>
+#   undef __KERNEL__
+#  endif /* HAVE_LINUX_KDEV_T_H */
+#  ifdef HAVE_LINUX_LIST_H
+#   define __KERNEL__
+#   include <linux/list.h>
+#   undef __KERNEL__
+#  endif /* HAVE_LINUX_LIST_H */
+#  include <linux/fs.h>
+# else
+#  include <linux/fs.h>
+# endif/* (!__GLIBC__ || __GLIBC__ < 2) */
+#endif /* HAVE_LINUX_FS_H */
 
 #ifdef HAVE_SYS_FS_TYPES_H
 # include <sys/fs_types.h>
@@ -192,6 +188,10 @@
 # include <isofs/cd9660/cd9660_mount.h>
 #endif /* HAVE_ISOFS_CD9660_CD9660_MOUNT_H */
 
+#ifdef HAVE_FS_UDF_UDF_MOUNT_H
+# include <fs/udf/udf_mount.h>
+#endif /* HAVE_FS_UDF_UDF_MOUNT_H */
+
 #ifdef HAVE_SYS_FS_PC_FS_H
 # include <sys/fs/pc_fs.h>
 #endif /* HAVE_SYS_FS_PC_FS_H */
@@ -202,6 +202,14 @@
 # include <fs/msdosfs/msdosfsmount.h>
 #endif /* HAVE_FS_MSDOSFS_MSDOSFSMOUNT_H */
 
+#ifdef HAVE_FS_TMPFS_TMPFS_ARGS_H
+# include <fs/tmpfs/tmpfs_args.h>
+#endif /* HAVE_FS_TMPFS_TMPFS_ARGS_H */
+
+#ifdef HAVE_FS_EFS_EFS_MOUNT_H
+# include <fs/efs/efs_mount.h>
+#endif /* HAVE_FS_EFS_EFS_MOUNT_H */
+
 #ifdef HAVE_RPC_RPC_H
 # include <rpc/rpc.h>
 #endif /* HAVE_RPC_RPC_H */