Branch HEAD

b=14746
r=adilger, bwzhou

patch for _IOWR redefined build error on SLES10 environment

diff --git a/lustre/include/ioctl.h b/lustre/include/ioctl.h
index a4ec8a5..6c3eb5a 100644 (file)
--- a/lustre/include/ioctl.h
+++ b/lustre/include/ioctl.h
@@ -1,5 +1,14 @@
-#ifndef _ASMI386_IOCTL_H
-#define _ASMI386_IOCTL_H
+
+#ifndef _IOWR
+
+/*
+ * on i386 and x86_64, _ASM_I386_IOCTL_H is defined by the kernel's ioctl.h
+ *
+ * We can avoid any problems with the kernel header being included again
+ * by defining _ASM_I386_IOCTL_H here so that a later occurence of
+ * <asm/ioctl.h> does not include the kernel's ioctl.h after this one.
+ */
+#define _ASM_I386_IOCTL_H

 
 /* ioctl command encoding: 32 bits total, command in lower 16 bits,
  * size of the parameter structure in the lower 14 bits of the
 
 /* ioctl command encoding: 32 bits total, command in lower 16 bits,
  * size of the parameter structure in the lower 14 bits of the


@@ -61,4 +70,5 @@
 #define IOCSIZE_MASK    (_IOC_SIZEMASK << _IOC_SIZESHIFT)
 #define IOCSIZE_SHIFT   (_IOC_SIZESHIFT)
 
 #define IOCSIZE_MASK    (_IOC_SIZEMASK << _IOC_SIZESHIFT)
 #define IOCSIZE_SHIFT   (_IOC_SIZESHIFT)
 

-#endif /* _ASMI386_IOCTL_H */
+#endif /* _IOWR */
+