Another not-yet-working-but-checking-in-not-to-lose-data landing of b_orphan.

Will do another merge with b_devel, but really dreading when b_proto lands...

diff --git a/lustre/utils/obdbarrier.c b/lustre/utils/obdbarrier.c
index 4373071..8774cef 100644 (file)
--- a/lustre/utils/obdbarrier.c
+++ b/lustre/utils/obdbarrier.c
@@ -214,9 +214,9 @@ main (int argc, char **argv)
                 }
         }
 
-        free (b);
+        free(b);
 
-        obdio_disconnect (conn);
+        obdio_disconnect(conn, 0);
 
         return (rc == 0 ? 0 : 1);
 }

diff --git a/lustre/utils/obdio.c b/lustre/utils/obdio.c
index 8264761..24b9e2d 100644 (file)
--- a/lustre/utils/obdio.c
+++ b/lustre/utils/obdio.c
@@ -294,10 +294,10 @@ main (int argc, char **argv)
         if (conn == NULL)
                 return (1);
 
-        rc = obdio_test_fixed_extent (conn, myhid, mypid, reps, locked,
-                                      oid, base_offset, size);
+        rc = obdio_test_fixed_extent(conn, myhid, mypid, reps, locked,
+                                     oid, base_offset, size);
 
-        obdio_disconnect (conn);
+        obdio_disconnect(conn, 0);
 
         return (rc == 0 ? 0 : 1);
 }

diff --git a/lustre/utils/obdiolib.c b/lustre/utils/obdiolib.c
index 8c79c67..223bfa5 100644 (file)
--- a/lustre/utils/obdiolib.c
+++ b/lustre/utils/obdiolib.c
@@ -118,7 +118,7 @@ obdio_connect (int device)
 }
 
 void
-obdio_disconnect (struct obdio_conn *conn)
+obdio_disconnect (struct obdio_conn *conn, int flags)
 {
         close (conn->oc_fd);
         /* obdclass will automatically close on last ref */