diff options
| author | Andrew Tridgell <tridge@samba.org> | 2002-07-15 03:51:53 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2002-07-15 03:51:53 +0000 |
| commit | ae10baa5fc98863c242b1036f588f59cf6ae3e0d (patch) | |
| tree | 56e52db6afb2b0874df6b3e76c4d9d2e9cae6f07 | |
| parent | 4dd9357dd55e0b65f99b42bfc6082ae3e2a19b0d (diff) | |
| download | samba-ae10baa5fc98863c242b1036f588f59cf6ae3e0d.tar.gz samba-ae10baa5fc98863c242b1036f588f59cf6ae3e0d.tar.bz2 samba-ae10baa5fc98863c242b1036f588f59cf6ae3e0d.zip | |
don't report the faiilure of non-blocking locks. They are supposed to
fail sometimes, thats why they are non-blocking :)
(This used to be commit 775b918b8c63b1fcd9a8db1743505ab718978c19)
| -rw-r--r-- | source3/tdb/tdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c index 1118ad9c67..ed75a55e3e 100644 --- a/source3/tdb/tdb.c +++ b/source3/tdb/tdb.c @@ -189,7 +189,7 @@ static int tdb_brlock(TDB_CONTEXT *tdb, tdb_off offset, } while (ret == -1 && errno == EINTR); if (ret == -1) { - if (!probe) { + if (!probe && lck_type != F_SETLK) { TDB_LOG((tdb, 5,"tdb_brlock failed (fd=%d) at offset %d rw_type=%d lck_type=%d\n", tdb->fd, offset, rw_type, lck_type)); } |