diff options
| author | Volker Lendecke <vl@samba.org> | 2012-01-06 17:19:54 +0100 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2012-01-18 14:48:04 +0100 |
| commit | 45e61fcf61ed9863fbe2b116fe0763fc139bbe0d (patch) | |
| tree | 06ea9ead2285b4a671d102edb8824422f7325703 /source3/modules | |
| parent | e75c436fe6a9ee44f6adc744b6269e99f4920431 (diff) | |
| download | samba-45e61fcf61ed9863fbe2b116fe0763fc139bbe0d.tar.gz samba-45e61fcf61ed9863fbe2b116fe0763fc139bbe0d.tar.bz2 samba-45e61fcf61ed9863fbe2b116fe0763fc139bbe0d.zip | |
s3: Add a "lock_order" argument to db_open
This will be used to enforce a lock hierarchy between the databases. We have
seen deadlocks between locking.tdb, brlock.tdb, serverid.tdb and notify*.tdb.
These should be fixed by refusing a dbwrap_fetch_locked that does not follow a
defined lock hierarchy.
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/nfs4_acls.c | 3 | ||||
| -rw-r--r-- | source3/modules/vfs_acl_tdb.c | 3 | ||||
| -rw-r--r-- | source3/modules/vfs_xattr_tdb.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index b4715af2ed..bd3c7fac72 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -590,7 +590,8 @@ static bool nfs4_map_sid(smbacl4_vfs_params *params, const struct dom_sid *src, become_root(); mapping_db = db_open(NULL, dbname, 0, TDB_DEFAULT, - O_RDONLY, 0600); + O_RDONLY, 0600, + DBWRAP_LOCK_ORDER_1); unbecome_root(); if (mapping_db == NULL) { diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c index 67d0540fef..f68afd88be 100644 --- a/source3/modules/vfs_acl_tdb.c +++ b/source3/modules/vfs_acl_tdb.c @@ -59,7 +59,8 @@ static bool acl_tdb_init(void) } become_root(); - acl_db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + acl_db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600, + DBWRAP_LOCK_ORDER_1); unbecome_root(); if (acl_db == NULL) { diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c index 8f367f359a..f00caa4ea7 100644 --- a/source3/modules/vfs_xattr_tdb.c +++ b/source3/modules/vfs_xattr_tdb.c @@ -601,7 +601,8 @@ static bool xattr_tdb_init(int snum, struct db_context **p_db) /* now we know dbname is not NULL */ become_root(); - db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600, + DBWRAP_LOCK_ORDER_2); unbecome_root(); if (db == NULL) { |