Changeset 77 for trunk/samba/source/torture/locktest2.c

Timestamp:

Sep 30, 2007, 3:42:50 AM (18 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0pre1

File:

• trunk/samba/source/torture/locktest2.c (modified) (6 diffs)

trunk/samba/source/torture/locktest2.c

@@ -6 +6 @@
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
@@ -15 +15 @@
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -137 +136 @@
 }       
 
-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, 
+                      br_off start, br_off size,
+                      void *private_data)
+{
+        printf("%6d   %s    %s  %.0f:%.0f(%.0f)\n", 
+               (int)procid_to_pid(&pid), file_id_string_tos(&id),
                lock_type==READ_LOCK?"R":"W",
                (double)start, (double)start+size-1,(double)size);
@@ -260 +260 @@
                                ret[0], ret[1]);
                 }
-                if (showall) brl_forall(print_brl);
+                if (showall) brl_forall(print_brl, NULL);
                 if (ret[0] != ret[1]) return False;
         } else if (r2 < LOCK_PCT+UNLOCK_PCT) {
@@ -275 +275 @@
                                ret[0], ret[1]);
                 }
-                if (showall) brl_forall(print_brl);
+                if (showall) brl_forall(print_brl, NULL);
                 if (!hide_unlock_fails && ret[0] != ret[1]) return False;
         } else {
@@ -291 +291 @@
                         printf("reopen conn=%u fstype=%u f=%u\n",
                                conn, fstype, f);
-                        brl_forall(print_brl);
+                        brl_forall(print_brl, NULL);
                 }
         }