← Back to branch summary

~ubuntu-branches/debian/sid/tdb/sid

« back to all changes in this revision

Viewing changes to .pc/30_tdb_logging_func.diff/common/open.c

  • Committer: Package Import Robot
  • Author(s): Jelmer Vernooij
  • Date: 2014-12-01 21:44:24 UTC
  • mfrom: (1.4.11)
  • Revision ID: package-import@ubuntu.com-20141201214424-9w871mf4fvvh8tdl
Tags: 1.3.2-1
http://bugs.debian.org/749986
* New upstream release.
 + Fixes __attribute__((visibility)) check to not use nested functions.
   Closes: #749986
* Drop missing-stdbool-include.patch; now included upstream.
* Update 40_test_transaction_expand_non_fatal.diff: Ignore tdb1-run-
  mutex-openflags2 test output, since newly added test fails on
  Debian.
* Bump standards version to 3.9.6 (no changes).

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/30_tdb_logging_func.diff/common/open.c
232
232
{
233
233
        int locked;
234
234
 
 
235
        if (tdb->flags & TDB_NOLOCK) {
 
236
                /*
 
237
                 * We don't look at locks, so it does not matter to have a
 
238
                 * compatible mutex implementation. Allow the open.
 
239
                 */
 
240
                return true;
 
241
        }
 
242
 
235
243
        locked = tdb_nest_lock(tdb, ACTIVE_LOCK, F_WRLCK,
236
244
                               TDB_LOCK_NOWAIT|TDB_LOCK_PROBE);
237
245
 
261
269
                return false;
262
270
        }
263
271
 
264
 
        if (tdb->flags & TDB_NOLOCK) {
265
 
                /*
266
 
                 * We don't look at locks, so it does not matter to have a
267
 
                 * compatible mutex implementation. Allow the open.
268
 
                 */
269
 
                return true;
270
 
        }
271
 
 
272
272
check_local_settings:
273
273
 
274
274
        if (!(tdb->flags & TDB_MUTEX_LOCKING)) {
399
399
                tdb->read_only = 1;
400
400
                /* read only databases don't do locking or clear if first */
401
401
                tdb->flags |= TDB_NOLOCK;
402
 
                tdb->flags &= ~TDB_CLEAR_IF_FIRST;
 
402
                tdb->flags &= ~(TDB_CLEAR_IF_FIRST|TDB_MUTEX_LOCKING);
403
403
        }
404
404
 
405
405
        if ((tdb->flags & TDB_ALLOW_NESTING) &&