Change lov.xml file a little so that it works with localhost.

Remove the namespace locks from ll_file_release. Basic parallel I/O
now works, it seems.

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 37dccc6..b1a6287 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -185,7 +185,8 @@ static int ll_file_release(struct inode *inode, struct file *file)
         }
         ptlrpc_free_req(fd->fd_req);
 
-        l_lock(&obddev->obd_namespace->ns_lock);
+        // XXX Phil lov devices have no namespace
+        //l_lock(&obddev->obd_namespace->ns_lock);
         list_for_each_safe(tmp, next, &lli->lli_osc_locks) {
                 struct ldlm_lock *lock;
                 struct lustre_handle lockh;
@@ -200,7 +201,7 @@ static int ll_file_release(struct inode *inode, struct file *file)
                 if (rc < 0)
                         CERROR("ldlm_cli_cancel: %d\n", rc);
         }
-        l_unlock(&obddev->obd_namespace->ns_lock);
+        //l_unlock(&obddev->obd_namespace->ns_lock);
 
         EXIT;
 

diff --git a/lustre/tests/lov.sh b/lustre/tests/lov.sh
index cf53436..ea6b380 100755 (executable)
--- a/lustre/tests/lov.sh
+++ b/lustre/tests/lov.sh
@@ -6,7 +6,7 @@ LMC=../utils/lmc
 echo "FIXME: autoformat is no by default, edit $config to change"
 
 # create nodes
-${LMC} -o $config --node localhost --net uml1 tcp 
+${LMC} -o $config --node localhost --net localhost tcp 
 
 # configure mds server
 ${LMC} -m $config --format --node localhost --mds mds1 /tmp/mds1 50000

diff --git a/lustre/tests/lov.xml b/lustre/tests/lov.xml
index 25916ce..60c183f 100644 (file)
--- a/lustre/tests/lov.xml
+++ b/lustre/tests/lov.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE lustre>
 <lustre>
   <ldlm name='ldlm' uuid='ldlm_UUID'/>
   <node name='localhost' uuid='localhost_UUID'>
@@ -15,8 +16,8 @@
       <mdc_ref uuidref='MDC_mds1_UUID'/>
     </profile>
     <network name='NET_localhost_tcp' uuid='NET_localhost_tcp_UUID' type='tcp'>
-      <server>uml1</server>
-      <port>888</port>
+      <server>localhost</server>
+      <port>988</port>
     </network>
   </node>
   <mds name='mds1' uuid='mds1_UUID'>
@@ -31,7 +32,7 @@
   </mdc>
   <lov name='lov1' uuid='lov1_UUID'>
     <mds_ref uuidref='mds1_UUID'/>
-    <devices stripeoffset='0' stripesize='4096' pattern='0'>
+    <devices stripesize='4096' stripeoffset='0' pattern='0'>
       <osc_ref uuidref='OSC_localhost_UUID'/>
       <osc_ref uuidref='OSC_localhost_2_UUID'/>
     </devices>