diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-03-22 10:47:27 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-03-22 01:57:38 +0100 |
| commit | a93e03d27de573988263aa4e39e55e7edbe34069 (patch) | |
| tree | 8ae240cf3575e129ffed86945123c626a765897a /lib/tdb2/tdb.c | |
| parent | aa5378602d8da09cccc9a435a6457245b13c2677 (diff) | |
| download | samba-a93e03d27de573988263aa4e39e55e7edbe34069.tar.gz samba-a93e03d27de573988263aa4e39e55e7edbe34069.tar.bz2 samba-a93e03d27de573988263aa4e39e55e7edbe34069.zip | |
lib/tdb2: fix OpenBSD incoherent mmap (tdb2 version)
This handles incoherent mmaps for TDB2 native databases, by forcing
mmap on for such systems, just like we did for tdb1.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb2/tdb.c')
| -rw-r--r-- | lib/tdb2/tdb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/tdb2/tdb.c b/lib/tdb2/tdb.c index c9224bdeed..4ba6924645 100644 --- a/lib/tdb2/tdb.c +++ b/lib/tdb2/tdb.c @@ -386,7 +386,9 @@ _PUBLIC_ void tdb_add_flag(struct tdb_context *tdb, unsigned flag) break; case TDB_NOMMAP: tdb->flags |= TDB_NOMMAP; +#ifndef HAVE_INCOHERENT_MMAP tdb_munmap(tdb->file); +#endif break; case TDB_NOSYNC: tdb->flags |= TDB_NOSYNC; @@ -423,7 +425,10 @@ _PUBLIC_ void tdb_remove_flag(struct tdb_context *tdb, unsigned flag) break; case TDB_NOMMAP: tdb->flags &= ~TDB_NOMMAP; +#ifndef HAVE_INCOHERENT_MMAP + /* If mmap incoherent, we were mmaping anyway. */ tdb_mmap(tdb); +#endif break; case TDB_NOSYNC: tdb->flags &= ~TDB_NOSYNC; |