summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-10-24 17:50:19 +0000
committerJeremy Allison <jra@samba.org>2003-10-24 17:50:19 +0000
commit99364f1615d86a6aeb9454d40cf596095b78fd1c (patch)
tree6e939a8fb30b0746f2d1b3fe2a65707d0f231250
parente958f3b50ec172f40c1187ca912c5aba6bb43eca (diff)
downloadsamba-99364f1615d86a6aeb9454d40cf596095b78fd1c.tar.gz
samba-99364f1615d86a6aeb9454d40cf596095b78fd1c.tar.bz2
samba-99364f1615d86a6aeb9454d40cf596095b78fd1c.zip
Janitorial duty for tpot. Merge tdb error log fix.
Jeremy. (This used to be commit 2186cbf28db496b97b39b81eb1932690c6094cd8)
-rw-r--r--source3/tdb/tdb.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c
index e68bda4055..c98b0936ed 100644
--- a/source3/tdb/tdb.c
+++ b/source3/tdb/tdb.c
@@ -237,10 +237,15 @@ static int tdb_brlock(TDB_CONTEXT *tdb, tdb_off offset,
tdb->fd, offset, rw_type, lck_type));
}
/* Was it an alarm timeout ? */
- if (errno == EINTR && palarm_fired && *palarm_fired)
+ if (errno == EINTR && palarm_fired && *palarm_fired) {
+ TDB_LOG((tdb, 5, "tdb_brlock timed out (fd=%d) at offset %d rw_type=%d lck_type=%d\n",
+ tdb->fd, offset, rw_type, lck_type));
return TDB_ERRCODE(TDB_ERR_LOCK_TIMEOUT, -1);
+ }
/* Otherwise - generic lock error. */
/* errno set by fcntl */
+ TDB_LOG((tdb, 5, "tdb_brlock failed (fd=%d) at offset %d rw_type=%d lck_type=%d: %s\n",
+ tdb->fd, offset, rw_type, lck_type, strerror(errno)));
return TDB_ERRCODE(TDB_ERR_LOCK, -1);
}
return 0;