r23183: Check in a change made by Tridge:

[sfrench/samba-autobuild/.git] / source / torture / locktest2.c

diff --git a/source/torture/locktest2.c b/source/torture/locktest2.c
index 519acebe8e81413621b1b66a69139aa78ce6d00e..184c84be439a4ab98246534ffe719fe490db8385 100644 (file)
--- a/source/torture/locktest2.c
+++ b/source/torture/locktest2.c
@@ -29,6 +29,9 @@ static BOOL analyze;
 static BOOL hide_unlock_fails;
 static BOOL use_oplocks;
 
+extern char *optarg;
+extern int optind;
+
 #define FILENAME "\\locktest.dat"
 #define LOCKRANGE 100
 #define LOCKBASE 0
@@ -133,12 +136,13 @@ static BOOL try_unlock(struct cli_state *c, int fstype,
        return False;
 }      
 
-static void print_brl(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, 
+static void print_brl(struct file_id id, struct server_id pid, 
                      enum brl_type lock_type,
+                     enum brl_flavour lock_flav,
                      br_off start, br_off size)
 {
-       printf("%6d   %05x:%05x    %s  %.0f:%.0f(%.0f)\n", 
-              (int)procid_to_pid(&pid), (int)dev, (int)ino, 
+       printf("%6d   %s    %s  %.0f:%.0f(%.0f)\n", 
+              (int)procid_to_pid(&pid), file_id_static_string(&id),
               lock_type==READ_LOCK?"R":"W",
               (double)start, (double)start+size-1,(double)size);
 
@@ -470,8 +474,6 @@ static void usage(void)
  int main(int argc,char *argv[])
 {
        char *share1, *share2, *nfspath1, *nfspath2;
-       extern char *optarg;
-       extern int optind;
        int opt;
        char *p;
        int seed;