Branch b1_6

b=13732
i=johann, liuy

change order of libsysio includes

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 86b26dd..d887df6 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -120,6 +120,11 @@ Details    : Modify target file & which_patch.
              could exploit this flaw to run code in the kernel 
              (ie a root privilege escalation). (CVE-2007-4573). 
 
+Severity   : minor
+Bugzilla   : 13732 
+Description: change order of libsysio includes
+Details    : '#include sysio.h' should always come before '#include xtio.h'
+
 --------------------------------------------------------------------------------
 
 2007-09-27         Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c
index da2eb26..e241dfc 100644 (file)
--- a/lustre/liblustre/dir.c
+++ b/lustre/liblustre/dir.c
@@ -33,10 +33,10 @@
 #include <fcntl.h>
 #include <sys/queue.h>
 
+#include <sysio.h>
 #ifdef HAVE_XTIO_H
 #include <xtio.h>
 #endif
-#include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>

diff --git a/lustre/liblustre/file.c b/lustre/liblustre/file.c
index 4548aeb..dc20c61 100644 (file)
--- a/lustre/liblustre/file.c
+++ b/lustre/liblustre/file.c
@@ -32,10 +32,10 @@
 #include <sys/queue.h>
 #include <fcntl.h>
 
+#include <sysio.h>
 #ifdef HAVE_XTIO_H
 #include <xtio.h>
 #endif
-#include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>

diff --git a/lustre/liblustre/llite_lib.c b/lustre/liblustre/llite_lib.c
index 49f97a7..8670528 100644 (file)
--- a/lustre/liblustre/llite_lib.c
+++ b/lustre/liblustre/llite_lib.c
@@ -29,10 +29,10 @@
 #include <sys/stat.h>
 #include <sys/queue.h>
 
+#include <sysio.h>
 #ifdef HAVE_XTIO_H
 #include <xtio.h>
 #endif
-#include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>

diff --git a/lustre/liblustre/namei.c b/lustre/liblustre/namei.c
index f01f448..2404ac5 100644 (file)
--- a/lustre/liblustre/namei.c
+++ b/lustre/liblustre/namei.c
@@ -32,10 +32,10 @@
 #include <fcntl.h>
 #include <sys/queue.h>
 
+#include <sysio.h>
 #ifdef HAVE_XTIO_H
 #include <xtio.h>
 #endif
-#include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>

diff --git a/lustre/liblustre/rw.c b/lustre/liblustre/rw.c
index c6e000f..4727947 100644 (file)
--- a/lustre/liblustre/rw.c
+++ b/lustre/liblustre/rw.c
@@ -33,10 +33,10 @@
 #include <fcntl.h>
 #include <sys/uio.h>
 
+#include <sysio.h>
 #ifdef HAVE_XTIO_H
 #include <xtio.h>
 #endif
-#include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>

diff --git a/lustre/liblustre/super.c b/lustre/liblustre/super.c
index eaa21ec..2cee7da 100644 (file)
--- a/lustre/liblustre/super.c
+++ b/lustre/liblustre/super.c
@@ -37,10 +37,10 @@
 # include <sys/statfs.h>
 #endif
 
+#include <sysio.h>
 #ifdef HAVE_XTIO_H
 #include <xtio.h>
 #endif
-#include <sysio.h>
 #include <fs.h>
 #include <mount.h>
 #include <inode.h>