X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Ftest_brw.c;h=27a56485dda92f2fa76704a509f5594dc9765013;hb=8fbef5ee761920faa3c84f142f56934d6266a409;hp=9d7dacb4de78a06938a89ebb3340976ae39ca9dd;hpb=4a0ec1d7621cc42e3139d067969e37b8285f7c06;p=fs%2Flustre-release.git

diff --git a/lustre/tests/test_brw.c b/lustre/tests/test_brw.c
index 9d7dacb..27a5648 100644
--- a/lustre/tests/test_brw.c
+++ b/lustre/tests/test_brw.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -51,16 +47,14 @@
 #include <sys/stat.h>
 #include <linux/types.h>
 
-#include <libcfs/byteorder.h>
-
 #define READ  1
 #define WRITE 2
 
-#define LPDS sizeof(__u64)
-int block_debug_setup(void *addr, int len, __u64 off, __u64 id)
+#define LPDS sizeof(uint64_t)
+int block_debug_setup(void *addr, int len, uint64_t off, uint64_t id)
 {
-        off = cpu_to_le64(off);
-        id = cpu_to_le64(id);
+	off = htole64(off);
+	id = htole64(id);
         memcpy(addr, (char *)&off, LPDS);
         memcpy(addr + LPDS, (char *)&id, LPDS);
 
@@ -76,8 +70,8 @@ int block_debug_check(char *who, void *addr, int size, uint64_t off, uint64_t id
 	uint64_t ne_off;
         int err = 0;
 
-        ne_off = le64_to_cpu(off);
-        id = le64_to_cpu(id);
+	ne_off = le64toh(off);
+	id = le64toh(id);
         if (memcmp(addr, (char *)&ne_off, LPDS)) {
 		fprintf(stderr, "%s: for offset %"PRIu64" off: %"PRIx64" != %"PRIx64"\n",
 			who, off, *(uint64_t *)addr, ne_off);
@@ -117,9 +111,9 @@ int main(int argc, char **argv)
 {
         int fd;
         char *buf;
-        long long count, last, offset;
+	long long count, last;
         long pg_vec, len;
-	uint64_t objid;
+	uint64_t objid, offset;
         struct stat st;
         int flags = 0;
         int cmd = 0;
@@ -222,10 +216,10 @@ int main(int argc, char **argv)
         }
 
         for (offset = 0; offset < last && cmd & WRITE; offset += len) {
-                int i;
+		unsigned int i;
 
                 for (i = 0; i < len; i += st.st_blksize)
-                        block_debug_setup(buf + i, st.st_blksize, 
+			block_debug_setup(buf + i, st.st_blksize,
                                           offset + i, objid);
 
                 rc = write(fd, buf, len);