diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2014-05-27 04:55:31 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2014-05-27 04:55:31 +0000 |
| commit | 41a48a0a1803245a188068c5200383b9543c25b2 (patch) | |
| tree | 6d1265a766b5c11e4c2414a994dbabb861526c73 /subversion/libsvn_fs_fs | |
| parent | 219f5ebf8fca3572d8d4265d78d0e4670ca35a27 (diff) | |
Notes
Diffstat (limited to 'subversion/libsvn_fs_fs')
| -rw-r--r-- | subversion/libsvn_fs_fs/fs.c | 5 | ||||
| -rw-r--r-- | subversion/libsvn_fs_fs/fs.h | 2 | ||||
| -rw-r--r-- | subversion/libsvn_fs_fs/rep-cache-db.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/subversion/libsvn_fs_fs/fs.c b/subversion/libsvn_fs_fs/fs.c index 691f416d3743b..d0ba7342a0b18 100644 --- a/subversion/libsvn_fs_fs/fs.c +++ b/subversion/libsvn_fs_fs/fs.c @@ -98,8 +98,11 @@ fs_serialized_init(svn_fs_t *fs, apr_pool_t *common_pool, apr_pool_t *pool) SVN_ERR(svn_mutex__init(&ffsd->txn_current_lock, SVN_FS_FS__USE_LOCK_MUTEX, common_pool)); + /* We also need a mutex for synchronizing access to the active + transaction list and free transaction pointer. This one is + enabled unconditionally. */ SVN_ERR(svn_mutex__init(&ffsd->txn_list_lock, - SVN_FS_FS__USE_LOCK_MUTEX, common_pool)); + TRUE, common_pool)); key = apr_pstrdup(common_pool, key); status = apr_pool_userdata_set(ffsd, key, NULL, common_pool); diff --git a/subversion/libsvn_fs_fs/fs.h b/subversion/libsvn_fs_fs/fs.h index ea301f6f5e7e1..5cdc27033fad2 100644 --- a/subversion/libsvn_fs_fs/fs.h +++ b/subversion/libsvn_fs_fs/fs.h @@ -266,7 +266,7 @@ typedef struct fs_fs_data_t svn_cache__t *dir_cache; /* Fulltext cache; currently only used with memcached. Maps from - rep key (revision/offset) to svn_string_t. */ + rep key (revision/offset) to svn_stringbuf_t. */ svn_cache__t *fulltext_cache; /* Access object to the atomics namespace used by revprop caching. diff --git a/subversion/libsvn_fs_fs/rep-cache-db.h b/subversion/libsvn_fs_fs/rep-cache-db.h index b02b052c56248..5e15107848004 100644 --- a/subversion/libsvn_fs_fs/rep-cache-db.h +++ b/subversion/libsvn_fs_fs/rep-cache-db.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from rep-cache-db.sql and .dist_sandbox/subversion-1.8.8/subversion/libsvn_fs_fs/token-map.h. +/* This file is automatically generated from rep-cache-db.sql and .dist_sandbox/subversion-1.8.9/subversion/libsvn_fs_fs/token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_CREATE_SCHEMA 0 |