You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/04/22 20:56:52 UTC
svn commit: r1589252 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Author: stefan2
Date: Tue Apr 22 18:56:52 2014
New Revision: 1589252
URL: http://svn.apache.org/r1589252
Log:
When taking out all locks on a FSFS repo, don't auto-create lock files
that are not supported / used by the respective repo format.
This is not strictly a correctness fix as the old formats will simply
ignore / not access those lock files. However, we don't want to litter
the repo with unsupported files.
* subversion/libsvn_fs_fs/fs_fs.c
(svn_fs_fs__with_all_locks): The txn-current-lock is not always available.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1589252&r1=1589251&r2=1589252&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Tue Apr 22 18:56:52 2014
@@ -392,7 +392,8 @@ svn_fs_fs__with_all_locks(svn_fs_t *fs,
if (ffd->format >= SVN_FS_FS__MIN_PACK_LOCK_FORMAT)
lock_baton = chain_lock_baton(pack_lock, lock_baton);
- lock_baton = chain_lock_baton(txn_lock, lock_baton);
+ if (ffd->format >= SVN_FS_FS__MIN_TXN_CURRENT_FORMAT)
+ lock_baton = chain_lock_baton(txn_lock, lock_baton);
return svn_error_trace(with_lock(lock_baton, pool));
}