Changeset 745 for trunk/server/lib/tdb/common/io.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/tdb/common/io.c (modified) (4 diffs)

trunk/server/lib/tdb/common/io.c

@@ -7 +7 @@
    Copyright (C) Paul `Rusty' Russell              2000
    Copyright (C) Jeremy Allison                    2000-2003
-   
+
      ** NOTE! The following LGPL license applies to the tdb
      ** library. This does NOT imply that all of Samba is released
      ** under the LGPL
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -94 +94 @@
         // the owner (us) is not allowed to write to the file (different from unix)
         TDB_LOG((tdb, TDB_DEBUG_TRACE,"unlocking at %d len=%d before writing.\n", off, len));
-        tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, 1);
+        tdb_brunlock( tdb, F_RDLCK, off, len);
         // if a wider previous lock is in effect, we cannot write lock our segment
         // (e.g. a lock_upgrade locks all the file), so we hope the previous lock 
         // is a write lock: do not wait for lock.
-        tdb_brlock( tdb, off, F_WRLCK, F_SETLK, 0, len);
+        tdb_brlock( tdb, F_WRLCK, off, len, F_SETLK);
 #endif
 
@@ -126 +126 @@
                                  "write %d bytes at %d in two attempts\n",
                                  len, off));
-
 #ifdef __OS2__ // remove our lock
-                        tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, len);
+                        tdb_brunlock( tdb, F_WRLCK, off, len);
 #endif
                         return -1;
                 }
         }
-
 #ifdef __OS2__ // remove our lock
-        tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, len);
+                        tdb_brunlock( tdb, F_WRLCK, off, len);
 #endif
-
         return 0;
 }
@@ -497 +494 @@
         tdb_oob,
         tdb_expand_file,
-        tdb_brlock
 };