From a27509937ca8bb57b9d7cc6cd7a3dd06ac4a0455 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 18 Sep 2001 22:59:12 +0000 Subject: Roll back earlier fix after talking with Andrew. The write_lock_record and unlock are explicitly non-blocking. I will add a comment to this effect later. Jeremy. (This used to be commit e4b41a8f31729dfec92c4cb1f8b4759446cac0ff) --- source3/tdb/tdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3') diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c index 0207b00222..4eb851a943 100644 --- a/source3/tdb/tdb.c +++ b/source3/tdb/tdb.c @@ -996,11 +996,11 @@ static int write_lock_record(TDB_CONTEXT *tdb, tdb_off off) for (i = &tdb->travlocks; i; i = i->next) if (i->off == off) return -1; - return tdb_brlock(tdb, off, F_WRLCK, F_SETLKW, 1); + return tdb_brlock(tdb, off, F_WRLCK, F_SETLK, 1); } static int write_unlock_record(TDB_CONTEXT *tdb, tdb_off off) { - return tdb_brlock(tdb, off, F_UNLCK, F_SETLKW, 0); + return tdb_brlock(tdb, off, F_UNLCK, F_SETLK, 0); } /* fcntl locks don't stack: avoid unlocking someone else's */ static int unlock_record(TDB_CONTEXT *tdb, tdb_off off) -- cgit