From 184d099c795f92fb45d53c8f59f1d9bcc1dc813c Mon Sep 17 00:00:00 2001
From: tianying <tianying>
Date: Thu, 15 Jan 2004 08:28:09 +0000
Subject: [PATCH]     Update from HEAD

---
 lnet/include/lnet/list.h              | 1 -
 lustre/portals/include/portals/list.h | 1 -
 lustre/tests/rename.pl                | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lnet/include/lnet/list.h b/lnet/include/lnet/list.h
index 57713cb..9cab047 100644
--- a/lnet/include/lnet/list.h
+++ b/lnet/include/lnet/list.h
@@ -1,5 +1,4 @@
 #ifndef _LINUX_LIST_H
-
 /*
  * Simple doubly linked list implementation.
  *
diff --git a/lustre/portals/include/portals/list.h b/lustre/portals/include/portals/list.h
index 57713cb..9cab047 100644
--- a/lustre/portals/include/portals/list.h
+++ b/lustre/portals/include/portals/list.h
@@ -1,5 +1,4 @@
 #ifndef _LINUX_LIST_H
-
 /*
  * Simple doubly linked list implementation.
  *
diff --git a/lustre/tests/rename.pl b/lustre/tests/rename.pl
index ee9bb4d..dd6b5dc 100644
--- a/lustre/tests/rename.pl
+++ b/lustre/tests/rename.pl
@@ -93,7 +93,7 @@ for (my $i=1; $i<=$num_threads; $i++) {
 # Wait for all our threads to finish.
 my $child = 0;
 do {
-    $child = waitpid(-1, WNOHANG);
+    $child = waitpid(-1, 0);
 } until $child > 0;
 sleep 1;
 
-- 
1.8.3.1